From eb2e5ca2ffa74e3dd2579dcb70a347e6cd481545 Mon Sep 17 00:00:00 2001
From: "Dobbertin, Niclas" <niclas.dobbertin@mailbox.org>
Date: Fri, 21 Jun 2024 19:59:07 +0200
Subject: visual search

---
 modeling/prod_procedure.py | 46 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 13 deletions(-)

(limited to 'modeling/prod_procedure.py')

diff --git a/modeling/prod_procedure.py b/modeling/prod_procedure.py
index a40326d..1a7628b 100644
--- a/modeling/prod_procedure.py
+++ b/modeling/prod_procedure.py
@@ -50,7 +50,8 @@ def procedures(Model):
         isa         math_goal
         proc        =proc
         task        1
-        op          =op
+        op          check_if_number_arg1_start
+        nextop      =op
         arg1        =arg1
         arg2        =arg2
         arg1_idx      =arg1_idx
@@ -80,8 +81,7 @@ def procedures(Model):
         isa         math_goal
         arg1        ~None
         arg1        =arg1
-        op          =op
-        nextop      None
+        op          check_if_number_arg1_start
         ==>
         +retrieval>
         isa         number
@@ -89,7 +89,6 @@ def procedures(Model):
         =g>
         isa         math_goal
         op          check_if_number_arg1
-        nextop      =op
         """
     )
 
@@ -100,15 +99,14 @@ def procedures(Model):
         isa         math_goal
         arg1        =arg1
         op          check_if_number_arg1
-        nextop      =op
         =retrieval>
         isa         number
         number      =arg1
         ==>
         =g>
         isa         math_goal
-        op          =op
-        nextop      None
+        op          check_if_number_arg2_start
+        ~retrieval>
         """
     )
 
@@ -129,15 +127,15 @@ def procedures(Model):
         """
     )
 
-    proc_check_substitute_var2 = Model.productionstring(
-        name="proc_substitute_var2",
+    # direct cont from chech var1
+    proc_check_substitute_var2_alt = Model.productionstring(
+        name="proc_substitute_var2_alt",
         string="""
         =g>
         isa         math_goal
         arg2        ~None
         arg2        =arg2
-        op          =op
-        nextop      None
+        op          check_if_number_arg2_start
         ==>
         +retrieval>
         isa         number
@@ -145,10 +143,29 @@ def procedures(Model):
         =g>
         isa         math_goal
         op          check_if_number_arg2
-        nextop      =op
         """
     )
 
+    # proc_check_substitute_var2 = Model.productionstring(
+    #     name="proc_substitute_var2",
+    #     string="""
+    #     =g>
+    #     isa         math_goal
+    #     arg2        ~None
+    #     arg2        =arg2
+    #     op          =op
+    #     nextop      None
+    #     ==>
+    #     +retrieval>
+    #     isa         number
+    #     number      =arg2
+    #     =g>
+    #     isa         math_goal
+    #     op          check_if_number_arg2
+    #     nextop      =op
+    #     """
+    # )
+
     proc_check_substitute_var2_number = Model.productionstring(
         name="proc_substitute_var2_number",
         string="""
@@ -165,6 +182,7 @@ def procedures(Model):
         isa         math_goal
         op          =op
         nextop      None
+        ~retrieval>
         """
     )
 
@@ -182,6 +200,7 @@ def procedures(Model):
         =g>
         isa         math_goal
         op          vis_find_arg2
+        ~retrieval>
         """
     )
 
@@ -291,7 +310,8 @@ def procedures(Model):
         isa         math_goal
         proc        =proc
         task        2
-        op          =op
+        nextop          =op
+        op          check_if_number_arg2_start
         arg1        =arg1
         arg2        =arg2
         arg1_idx      =arg1_idx
-- 
cgit v1.2.3