Merge pull request #69 from opennars/dev_v3.0.1

Dev v3.0.1
opennars · Dec 29, 2018 · 3ee27f2 · 3ee27f2
2 parents 668b318 + a6ae538
commit 3ee27f2
Show file tree

Hide file tree

Showing 109 changed files with 23 additions and 21 deletions.
diff --git a/.cz-config.js b/.cz-config.js
diff --git a/.cz.json b/.cz.json
diff --git a/.editorconfig b/.editorconfig
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
diff --git a/.travis.yml b/.travis.yml
diff --git a/.travis/settings.xml b/.travis/settings.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
diff --git a/LICENSE b/LICENSE
diff --git a/NOTICE b/NOTICE
diff --git a/README.md b/README.md
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.opennars</groupId>
     <artifactId>opennars-lab</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
@@ -118,12 +118,12 @@
         <dependency>
             <groupId>org.opennars</groupId>
             <artifactId>opennars</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>3.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opennars</groupId>
             <artifactId>opennars-gui</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>3.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.encog</groupId>

diff --git a/src/main/java/org/opennars/lab/codegen/codegenML1.nal b/src/main/java/org/opennars/lab/codegen/codegenML1.nal
diff --git a/src/main/java/org/opennars/lab/grid2d/gui/EditorPanel.java b/src/main/java/org/opennars/lab/grid2d/gui/EditorPanel.java
@@ -300,7 +300,7 @@ public void run() {
                         }    
                     }
                     for(TaskLink T : toDelete) {
-                        c.taskLinks.take(T);
+                        c.taskLinks.pickOut(T);
                     }
                 }
             }

diff --git a/src/main/java/org/opennars/lab/grid2d/main/Action.java b/src/main/java/org/opennars/lab/grid2d/main/Action.java
diff --git a/src/main/java/org/opennars/lab/grid2d/main/Cell.java b/src/main/java/org/opennars/lab/grid2d/main/Cell.java
diff --git a/src/main/java/org/opennars/lab/grid2d/main/CellFunction.java b/src/main/java/org/opennars/lab/grid2d/main/CellFunction.java
diff --git a/src/main/java/org/opennars/lab/grid2d/main/CellState.java b/src/main/java/org/opennars/lab/grid2d/main/CellState.java
diff --git a/src/main/java/org/opennars/lab/grid2d/main/Effect.java b/src/main/java/org/opennars/lab/grid2d/main/Effect.java
diff --git a/src/main/java/org/opennars/lab/grid2d/main/Grid2DSpace.java b/src/main/java/org/opennars/lab/grid2d/main/Grid2DSpace.java
diff --git a/src/main/java/org/opennars/lab/grid2d/main/GridAgent.java b/src/main/java/org/opennars/lab/grid2d/main/GridAgent.java
diff --git a/src/main/java/org/opennars/lab/grid2d/main/GridObject.java b/src/main/java/org/opennars/lab/grid2d/main/GridObject.java
diff --git a/src/main/java/org/opennars/lab/grid2d/main/Hauto.java b/src/main/java/org/opennars/lab/grid2d/main/Hauto.java
@@ -14,6 +14,7 @@
  */
 package org.opennars.lab.grid2d.main;
 
+import java.util.Random;
 import org.opennars.main.Nar;
 import org.opennars.storage.Memory;
 import org.opennars.lab.grid2d.main.Cell.Logic;
@@ -50,6 +51,7 @@ public static int doornumber(Cell c) {
     public boolean bridge(Logic c) {
         return c == Logic.UNCERTAINBRIDGE || c == Logic.BRIDGE;
     }
+    Random rnd = new Random(42);
 
     //put to beginning because we will need this one most often
     public void ExecutionFunction(int t,int i,int j,Cell w,Cell r,Cell left,Cell right,Cell up,
@@ -142,7 +144,7 @@ public void ExecutionFunction(int t,int i,int j,Cell w,Cell r,Cell left,Cell rig
             w.value=(up.charge==1 ^ down.charge==1) ? 1.0f : 0.0f;  //eval state from input connections
 
         //ADD BIDIRECTIONAL LOGIC BRIDGE TO OVERCOME 2D TOPOLOGY
-        if(r.logic==BRIDGE || (r.logic==UNCERTAINBRIDGE && Memory.randomNumber.nextDouble()>0.5))
+        if(r.logic==BRIDGE || (r.logic==UNCERTAINBRIDGE && rnd.nextDouble()>0.5))
         {
             if(left.chargeFront && left.logic==WIRE)
                 w.value=left.charge;

diff --git a/src/main/java/org/opennars/lab/grid2d/main/LocalGridObject.java b/src/main/java/org/opennars/lab/grid2d/main/LocalGridObject.java
diff --git a/src/main/java/org/opennars/lab/grid2d/main/RayVision.java b/src/main/java/org/opennars/lab/grid2d/main/RayVision.java
diff --git a/src/main/java/org/opennars/lab/grid2d/main/SimplexNoise.java b/src/main/java/org/opennars/lab/grid2d/main/SimplexNoise.java
diff --git a/src/main/java/org/opennars/lab/grid2d/main/TestChamber.java b/src/main/java/org/opennars/lab/grid2d/main/TestChamber.java
diff --git a/src/main/java/org/opennars/lab/grid2d/map/Cave.java b/src/main/java/org/opennars/lab/grid2d/map/Cave.java
diff --git a/src/main/java/org/opennars/lab/grid2d/map/Dungeon.java b/src/main/java/org/opennars/lab/grid2d/map/Dungeon.java
diff --git a/src/main/java/org/opennars/lab/grid2d/map/Maze.java b/src/main/java/org/opennars/lab/grid2d/map/Maze.java
diff --git a/src/main/java/org/opennars/lab/grid2d/object/Door.java b/src/main/java/org/opennars/lab/grid2d/object/Door.java
diff --git a/src/main/java/org/opennars/lab/grid2d/object/Key.java b/src/main/java/org/opennars/lab/grid2d/object/Key.java
diff --git a/src/main/java/org/opennars/lab/grid2d/object/Pizza.java b/src/main/java/org/opennars/lab/grid2d/object/Pizza.java
diff --git a/src/main/java/org/opennars/lab/grid2d/operator/Activate.java b/src/main/java/org/opennars/lab/grid2d/operator/Activate.java
diff --git a/src/main/java/org/opennars/lab/grid2d/operator/Deactivate.java b/src/main/java/org/opennars/lab/grid2d/operator/Deactivate.java
diff --git a/src/main/java/org/opennars/lab/grid2d/operator/Goto.java b/src/main/java/org/opennars/lab/grid2d/operator/Goto.java
diff --git a/src/main/java/org/opennars/lab/grid2d/operator/Pick.java b/src/main/java/org/opennars/lab/grid2d/operator/Pick.java
diff --git a/src/main/java/org/opennars/lab/language/LanguageGUI.form b/src/main/java/org/opennars/lab/language/LanguageGUI.form
diff --git a/src/main/java/org/opennars/lab/language/LanguageGUI.java b/src/main/java/org/opennars/lab/language/LanguageGUI.java
@@ -286,7 +286,7 @@ private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
             ans.off();
         }
         languageNAR.reset();
-        Memory.randomNumber.setSeed(seed);
+        languageNAR.memory.randomNumber.setSeed(seed);
         seed++;
 
         try {

diff --git a/src/main/java/org/opennars/lab/launcher/Launcher.form b/src/main/java/org/opennars/lab/launcher/Launcher.form
diff --git a/src/main/java/org/opennars/lab/launcher/Launcher.java b/src/main/java/org/opennars/lab/launcher/Launcher.java
diff --git a/src/main/java/org/opennars/lab/launcher/NARGame.java b/src/main/java/org/opennars/lab/launcher/NARGame.java
diff --git a/src/main/java/org/opennars/lab/lazyminer/LazyMiner.java b/src/main/java/org/opennars/lab/lazyminer/LazyMiner.java
diff --git a/src/main/java/org/opennars/lab/lazyminer/Main.java b/src/main/java/org/opennars/lab/lazyminer/Main.java
diff --git a/src/main/java/org/opennars/lab/lazyminer/PatientSimulator.java b/src/main/java/org/opennars/lab/lazyminer/PatientSimulator.java
diff --git a/src/main/java/org/opennars/lab/microworld/Pong.java b/src/main/java/org/opennars/lab/microworld/Pong.java
diff --git a/src/main/java/org/opennars/lab/microworld/PongComplex.java b/src/main/java/org/opennars/lab/microworld/PongComplex.java
diff --git a/src/main/java/org/opennars/lab/microworld/SimNAR.java b/src/main/java/org/opennars/lab/microworld/SimNAR.java
diff --git a/src/main/java/org/opennars/lab/microworld/SupervisedRecognition.java b/src/main/java/org/opennars/lab/microworld/SupervisedRecognition.java
diff --git a/src/main/java/org/opennars/lab/nalnet/NALNetEditor.java b/src/main/java/org/opennars/lab/nalnet/NALNetEditor.java
diff --git a/src/main/java/org/opennars/lab/nalnet/NALNetwork.java b/src/main/java/org/opennars/lab/nalnet/NALNetwork.java
diff --git a/src/main/java/org/opennars/lab/operator/MathExpression.java b/src/main/java/org/opennars/lab/operator/MathExpression.java
diff --git a/src/main/java/org/opennars/lab/plugin/app/farg/Codelet.java b/src/main/java/org/opennars/lab/plugin/app/farg/Codelet.java
diff --git a/src/main/java/org/opennars/lab/plugin/app/farg/FluidAnalogiesAgents.java b/src/main/java/org/opennars/lab/plugin/app/farg/FluidAnalogiesAgents.java
@@ -22,7 +22,7 @@
 import org.opennars.main.Nar;
 import org.opennars.plugin.Plugin;
 import org.opennars.language.Term;
-import org.opennars.storage.LevelBag;
+import org.opennars.storage.Bag;
 
 /**
  *
@@ -32,7 +32,7 @@ public class FluidAnalogiesAgents implements Plugin {
     public int max_codelets=100;
     public int codelet_level=100;
     Workspace ws;
-    LevelBag<Codelet,Term> coderack;
+    Bag<Codelet,Term> coderack;
 
     @Override
     public boolean setEnabled(Nar n, boolean enabled) {

diff --git a/src/main/java/org/opennars/lab/plugin/app/farg/Workspace.java b/src/main/java/org/opennars/lab/plugin/app/farg/Workspace.java
@@ -23,7 +23,7 @@
 import org.opennars.io.events.Events.CycleEnd;
 import org.opennars.main.Nar;
 import org.opennars.entity.Concept;
-import org.opennars.storage.LevelBag;
+import org.opennars.storage.Bag;
 
 /**
  *
@@ -38,13 +38,13 @@ public class Workspace {
     public Workspace(FluidAnalogiesAgents farg, Nar nar) {
         this.nar=nar;
         Workspace ws=this;
-        farg.coderack=new LevelBag(farg.codelet_level,farg.max_codelets, nar.narParameters);
+        farg.coderack=new Bag(farg.codelet_level,farg.max_codelets, nar.narParameters);
         nar.on(CycleEnd.class, new EventObserver() { 
 
             @Override
             public void event(Class event, Object[] args) {
                 for(int i=0;i<10;i++) { //process 10 codelets in each step
-                    Codelet cod=farg.coderack.takeNext();
+                    Codelet cod=farg.coderack.takeOut();
                     if(cod!=null) {
                         if(cod.run(ws)) {
                             farg.coderack.putIn(cod);

diff --git a/src/main/java/org/opennars/lab/plugin/input/PerceptionAccel.java b/src/main/java/org/opennars/lab/plugin/input/PerceptionAccel.java
diff --git a/src/main/java/org/opennars/lab/plugin/mental/GlobalAnticipation.java b/src/main/java/org/opennars/lab/plugin/mental/GlobalAnticipation.java
@@ -155,7 +155,7 @@ public void temporalPredictionsAdapt(DerivationContext nal) {
 
                 //handling of other events, seeing if they match and are right in time
 
-                if(!Variables.hasSubstitute(Symbols.VAR_INDEPENDENT, args[i], lastEvents.get(i-off).sentence.term)) { //it didnt match, instead sth different unexpected happened
+                if(!Variables.hasSubstitute(nal.memory.randomNumber, Symbols.VAR_INDEPENDENT, args[i], lastEvents.get(i-off).sentence.term)) { //it didnt match, instead sth different unexpected happened
                     matched=false; //whether intermediate events should be tolerated or not was a important question when considering this,
                     break; //if it should be allowed, the sequential match does not matter only if the events come like predicted.
                 } else { //however I decided that sequence matters also for now, because then the more accurate hypothesis wins.
@@ -193,7 +193,7 @@ public void temporalPredictionsAdapt(DerivationContext nal) {
                 long occurence=lastEvents.get(args.length-off).sentence.getOccurenceTime();
                 boolean right_in_time=Math.abs(occurence-expected_time)<((double)duration)/TEMPORAL_PREDICTION_FEEDBACK_ACCURACY_DIV;
 
-                if(right_in_time && Variables.hasSubstitute(Symbols.VAR_INDEPENDENT,imp.getPredicate(),lastEvents.get(args.length-off).sentence.term)) { //it matched and same consequence, so positive evidence
+                if(right_in_time && Variables.hasSubstitute(nal.memory.randomNumber, Symbols.VAR_INDEPENDENT,imp.getPredicate(),lastEvents.get(args.length-off).sentence.term)) { //it matched and same consequence, so positive evidence
                     //c.sentence.truth=TruthFunctions.revision(c.sentence.truth, new TruthValue(1.0f,Parameters.DEFAULT_JUDGMENT_CONFIDENCE));
                     Sentence s2=new Sentence(
                         c.sentence.term.clone(),

diff --git a/src/main/java/org/opennars/lab/predict/Predict_NARS_Core.java b/src/main/java/org/opennars/lab/predict/Predict_NARS_Core.java
diff --git a/src/main/java/org/opennars/lab/robot/NARVision_Processing_Sketch.txt b/src/main/java/org/opennars/lab/robot/NARVision_Processing_Sketch.txt
diff --git a/src/main/java/org/opennars/lab/robot/RobotFirmware_Adruino_Sketch.txt b/src/main/java/org/opennars/lab/robot/RobotFirmware_Adruino_Sketch.txt
diff --git a/src/main/java/org/opennars/lab/tictactoe/GridButtonPanel.java b/src/main/java/org/opennars/lab/tictactoe/GridButtonPanel.java
diff --git a/src/main/java/org/opennars/lab/tictactoe/TicTacToe.java b/src/main/java/org/opennars/lab/tictactoe/TicTacToe.java
diff --git a/src/main/java/org/opennars/lab/vision/ConcatVisionChannel.java b/src/main/java/org/opennars/lab/vision/ConcatVisionChannel.java
diff --git a/src/main/java/org/opennars/lab/vision/RasterHierachy.java b/src/main/java/org/opennars/lab/vision/RasterHierachy.java
diff --git a/src/main/java/org/opennars/lab/vision/SpatialSamplingVisionChannel.java b/src/main/java/org/opennars/lab/vision/SpatialSamplingVisionChannel.java
@@ -24,7 +24,7 @@
 import org.opennars.interfaces.Timable;
 import org.opennars.plugin.perception.SensoryChannel;
 import org.opennars.language.Term;
-import org.opennars.storage.LevelBag;
+import org.opennars.storage.Bag;
 import org.opennars.storage.Memory;
 
 public class SpatialSamplingVisionChannel extends SensoryChannel {
@@ -33,17 +33,17 @@ public class Position {
         public int Y;
     }
 
-    LevelBag<Task<Term>,Sentence<Term>>[][] spatialbag;
+    Bag<Task<Term>,Sentence<Term>>[][] spatialbag;
     public SpatialSamplingVisionChannel(Nar nar, SensoryChannel reportResultsTo, int width, int height) {
         super(nar,reportResultsTo, width, height, -1, new Term("BRIGHT"));
-        spatialbag = new LevelBag[height][width];
+        spatialbag = new Bag[height][width];
     }
 
     public void AddToSpatialBag(Task t) {
         int x = t.getTerm().term_indices[2];
         int y = t.getTerm().term_indices[3];
         if(spatialbag[y][x] == null) {
-            spatialbag[y][x] = new LevelBag(100, 100, this.nar.narParameters);
+            spatialbag[y][x] = new Bag(100, 100, this.nar.narParameters);
         }
         t.incPriority((float) this.topDownPriority(t.getTerm()));
         spatialbag[y][x].putIn(t);
@@ -67,17 +67,17 @@ public Nar addInput(final Task t, final Timable time) {
     @Override
     public void step_start(final Timable time)
     {
-        int ind = Memory.randomNumber.nextInt(sampling.size());
+        int ind = nar.memory.randomNumber.nextInt(sampling.size());
         Position samplePos = sampling.get(ind);
-        Task sampled = spatialbag[samplePos.Y][samplePos.X].takeNext();
+        Task sampled = spatialbag[samplePos.Y][samplePos.X].takeOut();
         //Todo improve API, channel should not need to know where in the array x and y size is
 
         //spatial biased random sampling: 
-        int ind2 = Memory.randomNumber.nextInt(sampling.size());
+        int ind2 = nar.memory.randomNumber.nextInt(sampling.size());
         int s2posY = sampling.get(ind2).Y;
         int s2posX = sampling.get(ind2).X;
         if(spatialbag[s2posY][s2posX] != null) {
-            Task sampled2 = spatialbag[s2posY][s2posX].takeNext();
+            Task sampled2 = spatialbag[s2posY][s2posX].takeOut();
             if(sampled2 != null) {
                 //improve API, carrying out temporal inference should be easier..
                 List<Task> seq = proceedWithTemporalInduction(sampled.sentence, sampled2.sentence, sampled2, 

diff --git a/src/main/java/org/opennars/lab/vision/SymRecognizer.form b/src/main/java/org/opennars/lab/vision/SymRecognizer.form
diff --git a/src/main/java/org/opennars/lab/vision/SymRecognizer.java b/src/main/java/org/opennars/lab/vision/SymRecognizer.java
diff --git a/src/main/java/org/opennars/lab/vision/SymRecognizerWithVisionChannel.form b/src/main/java/org/opennars/lab/vision/SymRecognizerWithVisionChannel.form
diff --git a/src/main/java/org/opennars/lab/vision/SymRecognizerWithVisionChannel.java b/src/main/java/org/opennars/lab/vision/SymRecognizerWithVisionChannel.java
diff --git a/src/main/java/org/opennars/util/io/ChangedTextInput.java b/src/main/java/org/opennars/util/io/ChangedTextInput.java
diff --git a/src/main/java/org/opennars/util/io/ExampleFileInput.java b/src/main/java/org/opennars/util/io/ExampleFileInput.java
diff --git a/src/main/java/org/opennars/util/io/KeyboardInputExample.java b/src/main/java/org/opennars/util/io/KeyboardInputExample.java
diff --git a/src/main/java/org/opennars/util/test/ConceptMonitor.java b/src/main/java/org/opennars/util/test/ConceptMonitor.java
diff --git a/src/main/java/org/opennars/util/test/OutputCondition.java b/src/main/java/org/opennars/util/test/OutputCondition.java
diff --git a/src/main/java/org/opennars/util/test/OutputContainsCondition.java b/src/main/java/org/opennars/util/test/OutputContainsCondition.java
diff --git a/src/main/java/org/opennars/util/test/OutputEmptyCondition.java b/src/main/java/org/opennars/util/test/OutputEmptyCondition.java
diff --git a/src/main/java/org/opennars/util/test/OutputNotContainsCondition.java b/src/main/java/org/opennars/util/test/OutputNotContainsCondition.java
diff --git a/src/main/java/org/opennars/util/test/TuneTuffy.java b/src/main/java/org/opennars/util/test/TuneTuffy.java
diff --git a/src/main/resources/grid2d/and_switch_light.lvl b/src/main/resources/grid2d/and_switch_light.lvl
diff --git a/src/main/resources/grid2d/complex1.lvl b/src/main/resources/grid2d/complex1.lvl
diff --git a/src/main/resources/grid2d/dont_switch.lvl b/src/main/resources/grid2d/dont_switch.lvl
diff --git a/src/main/resources/grid2d/dont_switch2.lvl b/src/main/resources/grid2d/dont_switch2.lvl
diff --git a/src/main/resources/grid2d/ex4.lvl b/src/main/resources/grid2d/ex4.lvl
diff --git a/src/main/resources/grid2d/freq_generator.lvl b/src/main/resources/grid2d/freq_generator.lvl
diff --git a/src/main/resources/grid2d/house.lvl b/src/main/resources/grid2d/house.lvl
diff --git a/src/main/resources/grid2d/key2.lvl b/src/main/resources/grid2d/key2.lvl
diff --git a/src/main/resources/grid2d/pizzamaschine.lvl b/src/main/resources/grid2d/pizzamaschine.lvl
diff --git a/src/main/resources/grid2d/pizzeria.lvl b/src/main/resources/grid2d/pizzeria.lvl
diff --git a/src/main/resources/grid2d/simple.lvl b/src/main/resources/grid2d/simple.lvl
diff --git a/src/main/resources/grid2d/switchX4.lvl b/src/main/resources/grid2d/switchX4.lvl
diff --git a/src/main/resources/grid2d/switch_door_switch_light.lvl b/src/main/resources/grid2d/switch_door_switch_light.lvl
diff --git a/src/main/resources/grid2d/uncertain_event.lvl b/src/main/resources/grid2d/uncertain_event.lvl
diff --git a/src/main/resources/grid2d/uncertain_state.lvl b/src/main/resources/grid2d/uncertain_state.lvl
diff --git a/src/main/resources/language/language_knowledge.nal b/src/main/resources/language/language_knowledge.nal
diff --git a/src/main/resources/launcher/microworld.png b/src/main/resources/launcher/microworld.png
diff --git a/src/main/resources/launcher/nlp.png b/src/main/resources/launcher/nlp.png
diff --git a/src/main/resources/launcher/opennars_logo.png b/src/main/resources/launcher/opennars_logo.png
diff --git a/src/main/resources/launcher/pong.png b/src/main/resources/launcher/pong.png
diff --git a/src/main/resources/launcher/predict.png b/src/main/resources/launcher/predict.png
diff --git a/src/main/resources/launcher/rover.png b/src/main/resources/launcher/rover.png
diff --git a/src/main/resources/launcher/testchamber.png b/src/main/resources/launcher/testchamber.png
diff --git a/src/main/resources/microworld/agent.png b/src/main/resources/microworld/agent.png
diff --git a/src/main/resources/microworld/ball.png b/src/main/resources/microworld/ball.png
diff --git a/src/main/resources/microworld/bar.png b/src/main/resources/microworld/bar.png
diff --git a/src/main/resources/microworld/fire.png b/src/main/resources/microworld/fire.png
diff --git a/src/main/resources/microworld/food.png b/src/main/resources/microworld/food.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -300,7 +300,7 @@ public void run() { @@
                             }
                         }
                         for(TaskLink T : toDelete) {
-                            c.taskLinks.take(T);
+                            c.taskLinks.pickOut(T);
                         }
                     }
                 }
@@ Expand Down @@