M agpl-cr-tasks-insertions.adb

M agpl-containers-bulk-utils.ads M agpl-cr-assignment.adb M agpl-cr-assignment.ads
mosteo · Apr 28, 2007 · 7463513 · 7463513
1 parent 095a455
commit 7463513
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 1 deletion.
diff --git a/agpl-containers-bulk-utils.ads b/agpl-containers-bulk-utils.ads
@@ -34,7 +34,9 @@ package Agpl.Containers.Bulk.Utils is
    procedure Concatenate (Dest : in out Lists.List; Src : in Lists.List);
 
    function To_List (Src : in Vectors.Vector) return Lists.List;
+   function "+"     (Src : in Vectors.Vector) return Lists.List renames To_List;
 
    function To_Vector (Src : in Lists.List) return Vectors.Vector;
+   function "+"       (Src : in Lists.List) return Vectors.Vector renames To_Vector;
 
 end Agpl.Containers.Bulk.Utils;
diff --git a/agpl-cr-assignment.adb b/agpl-cr-assignment.adb
@@ -149,6 +149,22 @@ package body Agpl.Cr.Assignment is
       This.Agents.Include (Agent.Get_Name, Agent);
    end Set_Agent;
 
+   ----------------
+   -- Set_Agents --
+   ----------------
+
+   procedure Set_Agents (This   : in out Object;
+                         Agents :        Cr.Agent.Containers.Lists.List)
+   is
+      use Cr.Agent.Containers.Lists;
+      procedure Add (I : Cursor) is
+      begin
+         This.Set_Agent (Element (I));
+      end Add;
+   begin
+      Agents.Iterate (Add'Access);
+   end Set_Agents;
+
    -----------------
    -- Freeze_Plan --
    -----------------

diff --git a/agpl-cr-assignment.ads b/agpl-cr-assignment.ads
@@ -65,6 +65,9 @@ package Agpl.Cr.Assignment is
    procedure Set_Agent (This : in out Object; Agent : in Cr.Agent.Object'Class);
    --  Add or replace an agent and its tasks
 
+   procedure Set_Agents (This   : in out Object;
+                         Agents :        Cr.Agent.Containers.Lists.List);
+
    function Get_Agents (This : in Object)
                         return Agent.Containers.Lists.List;
    --  Get all agents with its tasks.

diff --git a/agpl-cr-tasks-insertions.adb b/agpl-cr-tasks-insertions.adb
@@ -14,7 +14,9 @@ package body Agpl.Cr.Tasks.Insertions is
    package Task_Lists renames Htn.Tasks.Containers.Lists;
 
    package Candidate_Vectors is
-        new Dynamic_Vector (Cr.Agent.Handle.Object);
+     new Dynamic_Vector (Cr.Agent.Handle.Object);
+
+   use type Htn.Tasks.Task_Id;
 
    ---------------
    -- Before_Id --
@@ -601,7 +603,13 @@ package body Agpl.Cr.Tasks.Insertions is
       New_Agent   : Cr.Agent.Handle.Object;
       Agent_Task  : Htn.Tasks.Task_Id;
    begin
+      if Natural (Tasks.Length) = 0 then
+         Inserted := Htn.Tasks.No_Task;
+         return;
+      end if;
+
       Agents.Iterate (Check'Access);
+
       if Agent_Vectors.Has_Element (Best_Agent) then
          Greedy_Tail (Agent_Vectors.Element (Best_Agent),
                       Tasks,
@@ -610,6 +618,10 @@ package body Agpl.Cr.Tasks.Insertions is
                       Agent_Task,
                       Agent_Total,
                       Agent_Delta);
+         if Agent_Task = Htn.Tasks.No_Task then
+            Inserted := Htn.Tasks.No_Task;
+            return;
+         end if;
          New_Ass    := Ass;
          New_Ass.Set_Agent (New_Agent.Get);
          Inserted   := Agent_Task;