Moving target vector to starting message.

Author: Rico Schrage

src/algorithm/admm/flex_admm.jl

@@ -36,14 +36,14 @@ function _create_C_and_d(u::Vector{<:Real})
     d[1] = sum(u)
 
     for j in 1:(m-1)
-      r1 = 1 + 2*(j-1) + 1
-      r2 = r1 + 1
+        r1 = 1 + 2*(j-1) + 1
+        r2 = r1 + 1
 
-      C[r1, j] =  1/u[j]
-      C[r1, m] = -1/u[m]
+        C[r1, j] =  1/u[j]
+        C[r1, m] = -1/u[m]
 
-      C[r2, j] = -1/u[j]
-      C[r2, m] =  1/u[m]
+        C[r2, j] = -1/u[j]
+        C[r2, m] =  1/u[m]
     end
 
     return C, d
@@ -88,7 +88,6 @@ function on_exchange_message(actor::ADMMFlexActor, carrier::Carrier, message_dat
 end
 
 @kwdef struct ADMMFlexCoordinator <: Coordinator
-    T::Vector{Float64}
     ρ::Float64 = 1.0 
     max_iters::Int64 = 100
     slack_penalty::Int64 = 100
@@ -97,8 +96,7 @@ end
 end
 
 # ADMM solver
-function _admm_flex(admm::ADMMFlexCoordinator, carrier::Carrier)
-    T = admm.T
+function _admm_flex(admm::ADMMFlexCoordinator, carrier::Carrier, T::Vector{Float64})
     ρ = admm.ρ
     max_iters = admm.max_iters
     slack_penalty = admm.slack_penalty
@@ -152,12 +150,13 @@ function _admm_flex(admm::ADMMFlexCoordinator, carrier::Carrier)
         end
         if k == max_iters
             @warn "Reached max iterations ($max_iters) without full convergence."
+            throw("ADMM not converged $x, $u")
         end
     end
     return x, z, u
 end
 
-function start_optimization(coordinator::ADMMFlexCoordinator, carrier::Carrier, message_data::Any, meta::Any)
-    x,_,_ = _admm_flex(coordinator, carrier)
+function start_optimization(coordinator::ADMMFlexCoordinator, carrier::Carrier, target::Vector{Float64}, meta::Any)
+    x,_,_ = _admm_flex(coordinator, carrier, target)
     return x
 end

src/carrier/mango.jl

@@ -7,7 +7,9 @@ struct MangoCarrier <: Carrier
     include_self::Bool
 end
 
-struct StartCoordinatedDistributedOptimization end
+struct StartCoordinatedDistributedOptimization 
+    input::Any
+end
 struct OptimizationFinishedMessage 
     result::Any
 end
@@ -27,7 +29,7 @@ end
 
 function Mango.handle_message(role::CoordinatorRole, message::StartCoordinatedDistributedOptimization, meta::Any)
     role.task = schedule(role, InstantTaskData()) do
-        x = start_optimization(role.coordinator, role.carrier, message, meta)
+        x = start_optimization(role.coordinator, role.carrier, message.input, meta)
 
         for (i, addr) in enumerate(others(role.carrier, "participant"))
             send_message(role, OptimizationFinishedMessage(x[i]), addr)

test/flex_admm_tests.jl

@@ -2,6 +2,65 @@ using Mango
 using DistributedOptimization
 using Test
 
+@testset "TestFlexADMMWithMangoCarrier" begin
+    container = create_tcp_container("127.0.0.1", 5555)
+
+    m = 2
+    l = zeros(m)
+    u = [6.0, 4.0]
+    C = [ 1.0 1.0;
+         -2/3 1.0;
+         -2/3 1.0]
+    d = [10.0; 0.0; 0.0]
+
+    flex_actor = ADMMFlexActor(l, u, C, d)
+    flex_actor2 = ADMMFlexActor(l, [3.0,2.0], C, [20.0;0.0;0.0])
+    dor = DistributedOptimizationRole(flex_actor)
+    dor2 = DistributedOptimizationRole(flex_actor2)
+
+    coordinator = ADMMFlexCoordinator()
+    coord_role = CoordinatorRole(coordinator)
+    
+    add_agent_composed_of(container, dor)
+    add_agent_composed_of(container, dor2)
+    ca = add_agent_composed_of(container, coord_role)
+    
+    auto_assign!(complete_topology(3), container)
+
+    activate(container) do
+        send_message(container, StartCoordinatedDistributedOptimization([1.0, 2.0]), address(ca))
+    end
+
+    @test flex_actor.x == [0.8076923071828561, 0.5384616848406112]
+    @test flex_actor2.x == [0.8076923071828561, 0.5384616848406112]
+end
+
+
+
+@testset "TestFlexADMMWithMangoCarrierConvCreate" begin
+    container = create_tcp_container("127.0.0.1", 5555)
+
+    flex_actor = create_admm_flex_actor_one_to_many(10, [0.6, 0.4])
+    flex_actor2 = create_admm_flex_actor_one_to_many(10, [0.6, 0.4])
+    coordinator = ADMMFlexCoordinator()
+
+    dor = DistributedOptimizationRole(flex_actor, tid=:custom)
+    dor2 = DistributedOptimizationRole(flex_actor2, tid=:custom)
+    coord_role = CoordinatorRole(coordinator, tid=:custom)
+    
+    add_agent_composed_of(container, dor)
+    add_agent_composed_of(container, dor2)
+    ca = add_agent_composed_of(container, coord_role)
+    
+    auto_assign!(complete_topology(3, tid=:custom), container)
+
+    activate(container) do
+        send_message(container, StartCoordinatedDistributedOptimization([1.0, 2.0]), address(ca))
+    end
+
+    @test result(flex_actor) == flex_actor.x == [0.807682990194497, 0.5384948521038107]
+    @test result(flex_actor2) == flex_actor2.x == [0.807682990194497, 0.5384948521038107]
+end
 
 @role struct HandleOptimizationResultRole
     got_it::Bool = false
@@ -17,7 +76,7 @@ end
     flex_actor = create_admm_flex_actor_one_to_many(10, [0.6, 0.4])
     flex_actor2 = create_admm_flex_actor_one_to_many(10, [0.6, 0.4])
     flex_actor3 = create_admm_flex_actor_one_to_many(10, [0.6, 0.4])
-    coordinator = ADMMFlexCoordinator(T=[1.0, 2.0])
+    coordinator = ADMMFlexCoordinator()
 
     dor = DistributedOptimizationRole(flex_actor, tid=:custom)
     dor2 = DistributedOptimizationRole(flex_actor2, tid=:custom)
@@ -35,7 +94,7 @@ end
     auto_assign!(complete_topology(3, tid=:custom), container)
 
     activate(container) do
-        wait(send_message(c, StartCoordinatedDistributedOptimization(), address(ca)))
+        wait(send_message(c, StartCoordinatedDistributedOptimization([1.0, 2.0]), address(ca)))
         wait(coord_role.task)
     end