From be9aa2cc897ce4ff8a42617f9707c179e0eeddbd Mon Sep 17 00:00:00 2001
From: "Dobbertin, Niclas" <niclas.dobbertin@mailbox.org>
Date: Mon, 2 Sep 2024 08:12:53 +0200
Subject: update

---
 modeling/prod_vis.py | 52 +++++++++++++++++++++-------------------------------
 1 file changed, 21 insertions(+), 31 deletions(-)

(limited to 'modeling/prod_vis.py')

diff --git a/modeling/prod_vis.py b/modeling/prod_vis.py
index c3c113d..c997e1f 100644
--- a/modeling/prod_vis.py
+++ b/modeling/prod_vis.py
@@ -281,9 +281,6 @@ def procedures(Model):
         isa         _visuallocation
         screen_x    =screen_x
         screen_y    200
-        +retrieval>
-        isa         number
-        number      1
         """,
     )
 
@@ -304,22 +301,15 @@ def procedures(Model):
         screen_y    =screen_y
         ?visual>
         state       free
-        =retrieval>
-        isa         number
-        number      =vis_counter
-        next        =next
         ==>
         =g>
         isa         math_goal
         op          search_arg1_idx
-        vis_counter =next
+        vis_counter 2
         +visual_location>
         isa         _visuallocation
         screen_x    =screen_x
         screen_y    300
-        +retrieval>
-        isa         number
-        number      =next
         """,
     )
 
@@ -340,22 +330,15 @@ def procedures(Model):
         screen_y    =screen_y
         ?visual>
         state       free
-        =retrieval>
-        isa         number
-        number      =vis_counter
-        next        =next
         ==>
         =g>
         isa         math_goal
         op          search_arg1_idx
-        vis_counter =next
+        vis_counter 3
         +visual_location>
         isa         _visuallocation
         screen_x    =screen_x
         screen_y    400
-        +retrieval>
-        isa         number
-        number      =next
         """,
     )
 
@@ -376,22 +359,15 @@ def procedures(Model):
         screen_y    =screen_y
         ?visual>
         state       free
-        =retrieval>
-        isa         number
-        number      =vis_counter
-        next        =next
         ==>
         =g>
         isa         math_goal
         op          search_arg1_idx
-        vis_counter =next
+        vis_counter 4
         +visual_location>
         isa         _visuallocation
         screen_x    =screen_x
         screen_y    500
-        +retrieval>
-        isa         number
-        number      =next
         """,
     )
 
@@ -567,6 +543,20 @@ def procedures(Model):
         arg2        =value
         """,
     )
+    vis_max_arg1_search_check_retry = Model.productionstring(
+        name="vis_max_arg1_search_check_retry",
+        string="""
+        =g>
+        isa         math_goal
+        op          max_arg1_encode
+        ?retrieval>
+        state       error
+        ==>
+        =g>
+        isa         math_goal
+        op          max_arg1_check
+        """
+    )
     vis_max_arg1_search_step2_encode = Model.productionstring(
         name="vis_max_arg1_search_step2_encode",
         string="""
@@ -1240,7 +1230,7 @@ def procedures(Model):
         ==>
         =g>
         isa         math_goal
-        op          done
+        op          expand
         arg2        =arg2
         vis_counter None
         expand_slot None
@@ -1539,7 +1529,7 @@ def procedures(Model):
         ==>
         =g>
         isa         math_goal
-        op          done
+        op          expand
         arg2        =result
         vis_counter None
         expand_slot None
@@ -1837,7 +1827,7 @@ def procedures(Model):
         ==>
         =g>
         isa         math_goal
-        op          done
+        op          expand
         arg2        =result
         vis_counter None
         expand_slot None
@@ -2183,7 +2173,7 @@ def procedures(Model):
         ==>
         =g>
         isa         math_goal
-        op          done
+        op          expand
         arg2        =result
         vis_counter None
         expand_slot None
-- 
cgit v1.2.3