print ~P instead of P{false}

Kappa-Dev · Feb 6, 2025 · 9b5bae5 · 9b5bae5
1 parent 0226211
commit 9b5bae5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/core/KaSa_rep/frontend/ckappa_sig.ml b/core/KaSa_rep/frontend/ckappa_sig.ml
@@ -255,6 +255,12 @@ let string_of_guard_state parameter error (a : c_state) =
   let error, bool = bool_of_state_index parameter error a in
   error, open_par ^ string_of_bool bool ^ close_par
 
+let prefix_of_guard_state parameter error (a : c_state) =
+  match a with
+  | 0 -> error, "~"
+  | 1 -> error, ""
+  | _ -> Exception.warn parameter error __POS__ Exit ""
+
 let get_agent_shape n_sites parameters =
   Misc_sa.fetch_array (int_of_site_name n_sites)
     (Remanent_parameters.get_agent_shape_array parameters)

diff --git a/core/KaSa_rep/frontend/ckappa_sig.mli b/core/KaSa_rep/frontend/ckappa_sig.mli
@@ -109,6 +109,12 @@ val string_of_guard_state :
   c_state ->
   Exception_without_parameter.exceptions_caught_and_uncaught * counter_name
 
+val prefix_of_guard_state :
+  Remanent_parameters_sig.parameters ->
+  Exception_without_parameter.exceptions_caught_and_uncaught ->
+  c_state ->
+  Exception_without_parameter.exceptions_caught_and_uncaught * counter_name
+
 val int_of_rule_id : c_rule_id -> int
 val rule_id_of_int : int -> c_rule_id
 val string_of_rule_id : c_rule_id -> string

diff --git a/core/KaSa_rep/frontend/handler.ml b/core/KaSa_rep/frontend/handler.ml
@@ -618,9 +618,9 @@ let string_of_guard parameters guardp kappa_handler ?state error =
   | None -> error, guard_param_name
   | Some s ->
     let error, guard_string =
-      Ckappa_sig.string_of_guard_state parameters error s
+      Ckappa_sig.prefix_of_guard_state parameters error s
     in
-    error, guard_param_name ^ guard_string
+    error, guard_string ^ guard_param_name
 
 let string_of_site_or_guard parameter error handler_kappa ?state
     ?(add_parentheses = false) agent_type site_int =

diff --git a/core/KaSa_rep/site_graphs/site_graphs.ml b/core/KaSa_rep/site_graphs/site_graphs.ml
@@ -453,9 +453,7 @@ module KaSa_site_graph = struct
         t
     | Some (agent_type, map) ->
       let error, site_string =
-        Handler.string_of_site_or_guard_contact_map ~ml_pos:(Some __POS__)
-          ~message:"undefined site" parameter error kappa_handler agent_type
-          (Ckappa_sig.guard_p_then_site_of_guard guardp)
+        Handler.string_of_guard parameter guardp kappa_handler ~state error
       in
       let error, ((agent_string, sitemap), guardmap) =
         Ckappa_sig.Agent_id_map_and_set.Map.find_default parameter error
@@ -466,21 +464,18 @@ module KaSa_site_graph = struct
       let error, state_bool =
         Ckappa_sig.bool_of_state_index parameter error state
       in
-      let error, state_string =
-        Ckappa_sig.string_of_guard_state parameter error state
-      in
       let error, old_asso =
         Ckappa_sig.GuardP_map_and_set.Map.find_option_without_logs parameter
           error guardp map
       in
-      let error, (new_map, state_string) =
+      let error, new_map =
         match old_asso with
         | None ->
           let error, map =
             Ckappa_sig.GuardP_map_and_set.Map.add parameter error guardp
               state_bool map
           in
-          error, (map, state_string)
+          error, map
         | Some old_bool ->
           if state_bool = old_bool then (
             let error, map =
@@ -491,18 +486,18 @@ module KaSa_site_graph = struct
               Exception.check_point Exception.warn parameter error error __POS__
                 Exit
             in
-            error, (map, state_string)
+            error, map
           ) else
             Exception.warn parameter error __POS__
-              ~message:"incompatible states" Exit (map, state_string)
+              ~message:"incompatible states" Exit map
       in
       let error, guard_params =
         Ckappa_sig.Agent_id_map_and_set.Map.add_or_overwrite parameter error
           agent_id (agent_type, new_map) t.guard_params
       in
       let error, guardmap =
         Wrapped_modules.LoggedStringMap.add_or_overwrite parameter error
-          site_string (Some state_string) guardmap
+          site_string None guardmap
       in
       let error, string_version =
         Ckappa_sig.Agent_id_map_and_set.Map.overwrite parameter error agent_id