Reporting child model breed/var lists correctly

Author: arthurhjorth

src/main/ChildModel.java

@@ -184,17 +184,19 @@ public LogoList listBreeds() {
 
     public LogoList listBreedsOwns() {
         LogoListBuilder llb = new LogoListBuilder();
+        // add turtle vars as a separate tuple
+        LogoListBuilder tuple  = new LogoListBuilder();
+        LogoListBuilder vars = new LogoListBuilder();
+        vars.addAll(workspace().world().program().turtlesOwn());
+        tuple.add("TURTLES");
+        tuple.add(vars.toLogoList());
+        llb.add(tuple.toLogoList());
+
         for (Map.Entry<String, List<String>> entry : workspace().world().program().breedsOwn().entrySet())
         {
-            LogoListBuilder tuple  = new LogoListBuilder();
-            LogoListBuilder vars = new LogoListBuilder();
-            for (String s : entry.getValue()){
-                vars.add(s);
-            }
-            // add turtles own to all of them too
-            for (String s: workspace().world().program().turtlesOwn()){
-                vars.add(s);
-            }
+            tuple = new LogoListBuilder();
+            vars  = new LogoListBuilder();
+            vars.addAll(entry.getValue());
             tuple.add(entry.getKey());
             tuple.add(vars.toLogoList());
             llb.add(tuple.toLogoList());
@@ -380,7 +382,6 @@ public LogoList getProcedures() {
                 String theString = p.args.get(i);
                 argLLB.add(theString);
             }
-//            p.syntax().
             pList.add(argLLB.toLogoList());
             outerLLB.add(pList.toLogoList());
         }

src/main/LevelsSpace.java

@@ -17,7 +17,6 @@
 
 import org.nlogo.api.*;
 import org.nlogo.api.Argument;
-import org.nlogo.api.CommandTask;
 import org.nlogo.api.Context;
 import org.nlogo.app.App;
 import org.nlogo.api.ExtensionObject;
@@ -29,6 +28,7 @@
 import org.nlogo.api.Syntax;
 import org.nlogo.app.ToolsMenu;
 import org.nlogo.nvm.*;
+import org.nlogo.nvm.ReporterTask;
 import org.nlogo.window.SpeedSliderPanel;
 import org.nlogo.window.ViewUpdatePanel;
 
@@ -80,6 +80,7 @@ public void load(PrimitiveManager primitiveManager) throws ExtensionException {
         primitiveManager.addPrimitive("of-descendant", new HierarchicalOf());
         primitiveManager.addPrimitive("uses-level-space?", new UsesLevelSpace());
         primitiveManager.addPrimitive("_model-procedures", new ModelProcedures());
+        primitiveManager.addPrimitive("to-OTPL", new ToOTPL());
 
 
         if (useGUI()) {
@@ -384,6 +385,26 @@ public Object report(Argument[] args, Context arg1)
 
     }
 
+    public static class ToOTPL extends DefaultReporter {
+            public Syntax getSyntax(){
+                return Syntax.reporterSyntax(new int[] {Syntax.CommandTaskType() | Syntax.ReporterTaskType() },
+                        Syntax.StringType());
+            }
+        @Override
+        public Object report(Argument[] args, Context arg1)
+                throws ExtensionException, LogoException {
+            Object task = args[0].get();
+            if (task instanceof ReporterTask) {
+                ReporterTask rTask = (ReporterTask) task;
+                return rTask.body().agentClassString;
+            } else {
+                org.nlogo.nvm.CommandTask cTask = (org.nlogo.nvm.CommandTask) task;
+                return cTask.procedure().syntax().agentClassString();
+            }
+        }
+
+    }
+
 
     public static class CloseModel extends DefaultCommand {
         public Syntax getSyntax() {