M agpl-cr-cost_matrix.adb

M agpl-cr-cost_matrix.ads M agpl-generic_file_store.adb
mosteo · Sep 5, 2006 · 948d677 · 948d677
1 parent f8c2485
commit 948d677
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 1 deletion.
diff --git a/agpl-cr-cost_matrix.adb b/agpl-cr-cost_matrix.adb
@@ -2,6 +2,8 @@ with Agpl.Conversions; use Agpl.Conversions;
 with Agpl.Cr.Tasks.Starting_Pose;
 with Agpl.Trace; use Agpl.Trace;
 
+with Ada.Containers;
+
 package body Agpl.Cr.Cost_Matrix is
 
    use type Cr.Costs;
@@ -254,4 +256,50 @@ package body Agpl.Cr.Cost_Matrix is
       Include (This.Matrix, Key (Agent, Ini, Fin), Cost);
    end Set_Cost;
 
+   ----------
+   -- Read --
+   ----------
+
+   procedure Read (Stream : access Ada.Streams.Root_Stream_Type'Class;
+                   This   :    out Object)
+   is
+      use Ada.Containers;
+      Size : constant Count_Type := Count_Type'Input (Stream);
+   begin
+      This.Matrix.Clear;
+      This.Matrix.Reserve_Capacity (Size);
+
+      for I in 1 .. Size loop
+         declare
+            Key : constant String := String'Input (Stream);
+            C   : constant Costs  := Costs'Input (Stream);
+         begin
+            This.Matrix.Include (Key, C);
+         end;
+--           if I rem 100 = 0 then
+--              Log ("Read" & I'Img & " of" & Size'Img, Always);
+--           end if;
+      end loop;
+   end Read;
+
+   -----------
+   -- Write --
+   -----------
+
+   procedure Write (Stream : access Ada.Streams.Root_Stream_Type'Class;
+                    This   : in     Object)
+   is
+      use Ada.Containers;
+
+      procedure Write (I : in Cursor) is
+      begin
+         String'Output (Stream, Key (I));
+         Costs'Output (Stream, Element (I));
+      end Write;
+
+   begin
+      Count_Type'Output (Stream, This.Matrix.Length);
+      This.Matrix.Iterate (Write'Access);
+   end Write;
+
 end Agpl.Cr.Cost_Matrix;
diff --git a/agpl-cr-cost_matrix.ads b/agpl-cr-cost_matrix.ads
@@ -32,6 +32,8 @@ with Agpl.Cr.Agent.Containers;
 with Agpl.Htn.Tasks;
 with Agpl.Htn.Tasks.Containers;
 
+with Ada.Streams;
+
 package Agpl.Cr.Cost_Matrix is
 
    pragma Preelaborate;
@@ -111,6 +113,14 @@ package Agpl.Cr.Cost_Matrix is
    procedure Print (This : in Object);
    --  Debug dump
 
+   procedure Read (Stream : access Ada.Streams.Root_Stream_Type'Class;
+                   This   :    out Object);
+   for Object'Read use Read;
+
+   procedure Write (Stream : access Ada.Streams.Root_Stream_Type'Class;
+                    This   : in     Object);
+   for Object'Write use Write;
+
 private
 
    package ATT_Maps is new Ada.Containers.Indefinite_Hashed_Maps

diff --git a/agpl-generic_file_store.adb b/agpl-generic_file_store.adb
@@ -38,7 +38,7 @@ package body Agpl.Generic_File_Store is
    begin
       Open (F, Name => File, Mode => In_File);
 
-      This := Item'Input (Stream (F));
+      Item'Read (Stream (F), This);
 
       Close (F);
    end Load;