From 3e9ea69ca87ec88ab757c733a89cb533ab1f532b Mon Sep 17 00:00:00 2001 From: Patrick Hammer Date: Fri, 23 Nov 2018 20:56:37 -0500 Subject: [PATCH 1/4] Update: pom: Version number increase. --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 0be1f01b..fe3ed8c5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.opennars opennars-lab - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT jar @@ -118,12 +118,12 @@ org.opennars opennars - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT org.opennars opennars-gui - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT org.encog From 6c8a28d0172b2b95c11676363cd3eb749658ffdb Mon Sep 17 00:00:00 2001 From: Patrick Hammer Date: Thu, 27 Dec 2018 12:53:35 +0000 Subject: [PATCH 2/4] Update: Dummy file flag commit. --- .cz-config.js | 0 .cz.json | 0 .editorconfig | 0 .gitattributes | 0 .gitignore | 0 .travis.yml | 0 .travis/settings.xml | 0 CHANGELOG.md | 0 CODE_OF_CONDUCT.md | 0 CONTRIBUTING.md | 0 CONTRIBUTORS.md | 0 LICENSE | 0 NOTICE | 0 README.md | 0 pom.xml | 0 .../java/org/opennars/lab/codegen/codegenML1.nal | 0 .../org/opennars/lab/grid2d/gui/EditorPanel.java | 0 .../java/org/opennars/lab/grid2d/main/Action.java | 0 .../java/org/opennars/lab/grid2d/main/Cell.java | 0 .../org/opennars/lab/grid2d/main/CellFunction.java | 0 .../org/opennars/lab/grid2d/main/CellState.java | 0 .../java/org/opennars/lab/grid2d/main/Effect.java | 0 .../org/opennars/lab/grid2d/main/Grid2DSpace.java | 0 .../org/opennars/lab/grid2d/main/GridAgent.java | 0 .../org/opennars/lab/grid2d/main/GridObject.java | 0 .../java/org/opennars/lab/grid2d/main/Hauto.java | 0 .../opennars/lab/grid2d/main/LocalGridObject.java | 0 .../org/opennars/lab/grid2d/main/RayVision.java | 0 .../org/opennars/lab/grid2d/main/SimplexNoise.java | 0 .../org/opennars/lab/grid2d/main/TestChamber.java | 0 src/main/java/org/opennars/lab/grid2d/map/Cave.java | 0 .../java/org/opennars/lab/grid2d/map/Dungeon.java | 0 src/main/java/org/opennars/lab/grid2d/map/Maze.java | 0 .../java/org/opennars/lab/grid2d/object/Door.java | 0 .../java/org/opennars/lab/grid2d/object/Key.java | 0 .../java/org/opennars/lab/grid2d/object/Pizza.java | 0 .../org/opennars/lab/grid2d/operator/Activate.java | 0 .../opennars/lab/grid2d/operator/Deactivate.java | 0 .../java/org/opennars/lab/grid2d/operator/Goto.java | 0 .../java/org/opennars/lab/grid2d/operator/Pick.java | 0 .../java/org/opennars/lab/language/LanguageGUI.form | 0 .../java/org/opennars/lab/language/LanguageGUI.java | 0 .../java/org/opennars/lab/launcher/Launcher.form | 0 .../java/org/opennars/lab/launcher/Launcher.java | 0 .../java/org/opennars/lab/launcher/NARGame.java | 0 .../java/org/opennars/lab/lazyminer/LazyMiner.java | 0 src/main/java/org/opennars/lab/lazyminer/Main.java | 0 .../opennars/lab/lazyminer/PatientSimulator.java | 0 src/main/java/org/opennars/lab/microworld/Pong.java | 0 .../org/opennars/lab/microworld/PongComplex.java | 0 .../java/org/opennars/lab/microworld/SimNAR.java | 0 .../lab/microworld/SupervisedRecognition.java | 0 .../java/org/opennars/lab/nalnet/NALNetEditor.java | 0 .../java/org/opennars/lab/nalnet/NALNetwork.java | 0 .../org/opennars/lab/operator/MathExpression.java | 0 .../org/opennars/lab/plugin/app/farg/Codelet.java | 0 .../lab/plugin/app/farg/FluidAnalogiesAgents.java | 0 .../org/opennars/lab/plugin/app/farg/Workspace.java | 0 .../opennars/lab/plugin/input/PerceptionAccel.java | 0 .../lab/plugin/mental/GlobalAnticipation.java | 0 .../org/opennars/lab/predict/Predict_NARS_Core.java | 0 .../lab/robot/NARVision_Processing_Sketch.txt | 0 .../lab/robot/RobotFirmware_Adruino_Sketch.txt | 0 .../org/opennars/lab/tictactoe/GridButtonPanel.java | 0 .../java/org/opennars/lab/tictactoe/TicTacToe.java | 0 .../opennars/lab/vision/ConcatVisionChannel.java | 0 .../org/opennars/lab/vision/RasterHierachy.java | 0 .../lab/vision/SpatialSamplingVisionChannel.java | 0 .../java/org/opennars/lab/vision/SymRecognizer.form | 0 .../java/org/opennars/lab/vision/SymRecognizer.java | 0 .../lab/vision/SymRecognizerWithVisionChannel.form | 0 .../lab/vision/SymRecognizerWithVisionChannel.java | 0 .../java/org/opennars/util/io/ChangedTextInput.java | 0 .../java/org/opennars/util/io/ExampleFileInput.java | 0 .../org/opennars/util/io/KeyboardInputExample.java | 0 .../java/org/opennars/util/test/ConceptMonitor.java | 0 .../org/opennars/util/test/OutputCondition.java | 0 .../opennars/util/test/OutputContainsCondition.java | 0 .../opennars/util/test/OutputEmptyCondition.java | 0 .../util/test/OutputNotContainsCondition.java | 0 src/main/java/org/opennars/util/test/TuneTuffy.java | 0 src/main/resources/grid2d/and_switch_light.lvl | 0 src/main/resources/grid2d/complex1.lvl | 0 src/main/resources/grid2d/dont_switch.lvl | 0 src/main/resources/grid2d/dont_switch2.lvl | 0 src/main/resources/grid2d/ex4.lvl | 0 src/main/resources/grid2d/freq_generator.lvl | 0 src/main/resources/grid2d/house.lvl | 0 src/main/resources/grid2d/key2.lvl | 0 src/main/resources/grid2d/pizzamaschine.lvl | 0 src/main/resources/grid2d/pizzeria.lvl | 0 src/main/resources/grid2d/simple.lvl | 0 src/main/resources/grid2d/switchX4.lvl | 0 .../resources/grid2d/switch_door_switch_light.lvl | 0 src/main/resources/grid2d/uncertain_event.lvl | 0 src/main/resources/grid2d/uncertain_state.lvl | 0 src/main/resources/language/language_knowledge.nal | 0 src/main/resources/launcher/microworld.png | Bin src/main/resources/launcher/nlp.png | Bin src/main/resources/launcher/opennars_logo.png | Bin src/main/resources/launcher/pong.png | Bin src/main/resources/launcher/predict.png | Bin src/main/resources/launcher/rover.png | Bin src/main/resources/launcher/testchamber.png | Bin src/main/resources/microworld/agent.png | Bin src/main/resources/microworld/ball.png | Bin src/main/resources/microworld/bar.png | Bin src/main/resources/microworld/fire.png | Bin src/main/resources/microworld/food.png | Bin 109 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .cz-config.js mode change 100644 => 100755 .cz.json mode change 100644 => 100755 .editorconfig mode change 100644 => 100755 .gitattributes mode change 100644 => 100755 .gitignore mode change 100644 => 100755 .travis.yml mode change 100644 => 100755 .travis/settings.xml mode change 100644 => 100755 CHANGELOG.md mode change 100644 => 100755 CODE_OF_CONDUCT.md mode change 100644 => 100755 CONTRIBUTING.md mode change 100644 => 100755 CONTRIBUTORS.md mode change 100644 => 100755 LICENSE mode change 100644 => 100755 NOTICE mode change 100644 => 100755 README.md mode change 100644 => 100755 pom.xml mode change 100644 => 100755 src/main/java/org/opennars/lab/codegen/codegenML1.nal mode change 100644 => 100755 src/main/java/org/opennars/lab/grid2d/gui/EditorPanel.java mode change 100644 => 100755 src/main/java/org/opennars/lab/grid2d/main/Action.java mode change 100644 => 100755 src/main/java/org/opennars/lab/grid2d/main/Cell.java mode change 100644 => 100755 src/main/java/org/opennars/lab/grid2d/main/CellFunction.java mode change 100644 => 100755 src/main/java/org/opennars/lab/grid2d/main/CellState.java mode change 100644 => 100755 src/main/java/org/opennars/lab/grid2d/main/Effect.java mode change 100644 => 100755 src/main/java/org/opennars/lab/grid2d/main/Grid2DSpace.java mode change 100644 => 100755 src/main/java/org/opennars/lab/grid2d/main/GridAgent.java mode change 100644 => 100755 src/main/java/org/opennars/lab/grid2d/main/GridObject.java mode change 100644 => 100755 src/main/java/org/opennars/lab/grid2d/main/Hauto.java mode change 100644 => 100755 src/main/java/org/opennars/lab/grid2d/main/LocalGridObject.java mode change 100644 => 100755 src/main/java/org/opennars/lab/grid2d/main/RayVision.java mode change 100644 => 100755 src/main/java/org/opennars/lab/grid2d/main/SimplexNoise.java mode change 100644 => 100755 src/main/java/org/opennars/lab/grid2d/main/TestChamber.java mode change 100644 => 100755 src/main/java/org/opennars/lab/grid2d/map/Cave.java mode change 100644 => 100755 src/main/java/org/opennars/lab/grid2d/map/Dungeon.java mode change 100644 => 100755 src/main/java/org/opennars/lab/grid2d/map/Maze.java mode change 100644 => 100755 src/main/java/org/opennars/lab/grid2d/object/Door.java mode change 100644 => 100755 src/main/java/org/opennars/lab/grid2d/object/Key.java mode change 100644 => 100755 src/main/java/org/opennars/lab/grid2d/object/Pizza.java mode change 100644 => 100755 src/main/java/org/opennars/lab/grid2d/operator/Activate.java mode change 100644 => 100755 src/main/java/org/opennars/lab/grid2d/operator/Deactivate.java mode change 100644 => 100755 src/main/java/org/opennars/lab/grid2d/operator/Goto.java mode change 100644 => 100755 src/main/java/org/opennars/lab/grid2d/operator/Pick.java mode change 100644 => 100755 src/main/java/org/opennars/lab/language/LanguageGUI.form mode change 100644 => 100755 src/main/java/org/opennars/lab/language/LanguageGUI.java mode change 100644 => 100755 src/main/java/org/opennars/lab/launcher/Launcher.form mode change 100644 => 100755 src/main/java/org/opennars/lab/launcher/Launcher.java mode change 100644 => 100755 src/main/java/org/opennars/lab/launcher/NARGame.java mode change 100644 => 100755 src/main/java/org/opennars/lab/lazyminer/LazyMiner.java mode change 100644 => 100755 src/main/java/org/opennars/lab/lazyminer/Main.java mode change 100644 => 100755 src/main/java/org/opennars/lab/lazyminer/PatientSimulator.java mode change 100644 => 100755 src/main/java/org/opennars/lab/microworld/Pong.java mode change 100644 => 100755 src/main/java/org/opennars/lab/microworld/PongComplex.java mode change 100644 => 100755 src/main/java/org/opennars/lab/microworld/SimNAR.java mode change 100644 => 100755 src/main/java/org/opennars/lab/microworld/SupervisedRecognition.java mode change 100644 => 100755 src/main/java/org/opennars/lab/nalnet/NALNetEditor.java mode change 100644 => 100755 src/main/java/org/opennars/lab/nalnet/NALNetwork.java mode change 100644 => 100755 src/main/java/org/opennars/lab/operator/MathExpression.java mode change 100644 => 100755 src/main/java/org/opennars/lab/plugin/app/farg/Codelet.java mode change 100644 => 100755 src/main/java/org/opennars/lab/plugin/app/farg/FluidAnalogiesAgents.java mode change 100644 => 100755 src/main/java/org/opennars/lab/plugin/app/farg/Workspace.java mode change 100644 => 100755 src/main/java/org/opennars/lab/plugin/input/PerceptionAccel.java mode change 100644 => 100755 src/main/java/org/opennars/lab/plugin/mental/GlobalAnticipation.java mode change 100644 => 100755 src/main/java/org/opennars/lab/predict/Predict_NARS_Core.java mode change 100644 => 100755 src/main/java/org/opennars/lab/robot/NARVision_Processing_Sketch.txt mode change 100644 => 100755 src/main/java/org/opennars/lab/robot/RobotFirmware_Adruino_Sketch.txt mode change 100644 => 100755 src/main/java/org/opennars/lab/tictactoe/GridButtonPanel.java mode change 100644 => 100755 src/main/java/org/opennars/lab/tictactoe/TicTacToe.java mode change 100644 => 100755 src/main/java/org/opennars/lab/vision/ConcatVisionChannel.java mode change 100644 => 100755 src/main/java/org/opennars/lab/vision/RasterHierachy.java mode change 100644 => 100755 src/main/java/org/opennars/lab/vision/SpatialSamplingVisionChannel.java mode change 100644 => 100755 src/main/java/org/opennars/lab/vision/SymRecognizer.form mode change 100644 => 100755 src/main/java/org/opennars/lab/vision/SymRecognizer.java mode change 100644 => 100755 src/main/java/org/opennars/lab/vision/SymRecognizerWithVisionChannel.form mode change 100644 => 100755 src/main/java/org/opennars/lab/vision/SymRecognizerWithVisionChannel.java mode change 100644 => 100755 src/main/java/org/opennars/util/io/ChangedTextInput.java mode change 100644 => 100755 src/main/java/org/opennars/util/io/ExampleFileInput.java mode change 100644 => 100755 src/main/java/org/opennars/util/io/KeyboardInputExample.java mode change 100644 => 100755 src/main/java/org/opennars/util/test/ConceptMonitor.java mode change 100644 => 100755 src/main/java/org/opennars/util/test/OutputCondition.java mode change 100644 => 100755 src/main/java/org/opennars/util/test/OutputContainsCondition.java mode change 100644 => 100755 src/main/java/org/opennars/util/test/OutputEmptyCondition.java mode change 100644 => 100755 src/main/java/org/opennars/util/test/OutputNotContainsCondition.java mode change 100644 => 100755 src/main/java/org/opennars/util/test/TuneTuffy.java mode change 100644 => 100755 src/main/resources/grid2d/and_switch_light.lvl mode change 100644 => 100755 src/main/resources/grid2d/complex1.lvl mode change 100644 => 100755 src/main/resources/grid2d/dont_switch.lvl mode change 100644 => 100755 src/main/resources/grid2d/dont_switch2.lvl mode change 100644 => 100755 src/main/resources/grid2d/ex4.lvl mode change 100644 => 100755 src/main/resources/grid2d/freq_generator.lvl mode change 100644 => 100755 src/main/resources/grid2d/house.lvl mode change 100644 => 100755 src/main/resources/grid2d/key2.lvl mode change 100644 => 100755 src/main/resources/grid2d/pizzamaschine.lvl mode change 100644 => 100755 src/main/resources/grid2d/pizzeria.lvl mode change 100644 => 100755 src/main/resources/grid2d/simple.lvl mode change 100644 => 100755 src/main/resources/grid2d/switchX4.lvl mode change 100644 => 100755 src/main/resources/grid2d/switch_door_switch_light.lvl mode change 100644 => 100755 src/main/resources/grid2d/uncertain_event.lvl mode change 100644 => 100755 src/main/resources/grid2d/uncertain_state.lvl mode change 100644 => 100755 src/main/resources/language/language_knowledge.nal mode change 100644 => 100755 src/main/resources/launcher/microworld.png mode change 100644 => 100755 src/main/resources/launcher/nlp.png mode change 100644 => 100755 src/main/resources/launcher/opennars_logo.png mode change 100644 => 100755 src/main/resources/launcher/pong.png mode change 100644 => 100755 src/main/resources/launcher/predict.png mode change 100644 => 100755 src/main/resources/launcher/rover.png mode change 100644 => 100755 src/main/resources/launcher/testchamber.png mode change 100644 => 100755 src/main/resources/microworld/agent.png mode change 100644 => 100755 src/main/resources/microworld/ball.png mode change 100644 => 100755 src/main/resources/microworld/bar.png mode change 100644 => 100755 src/main/resources/microworld/fire.png mode change 100644 => 100755 src/main/resources/microworld/food.png diff --git a/.cz-config.js b/.cz-config.js old mode 100644 new mode 100755 diff --git a/.cz.json b/.cz.json old mode 100644 new mode 100755 diff --git a/.editorconfig b/.editorconfig old mode 100644 new mode 100755 diff --git a/.gitattributes b/.gitattributes old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.travis.yml b/.travis.yml old mode 100644 new mode 100755 diff --git a/.travis/settings.xml b/.travis/settings.xml old mode 100644 new mode 100755 diff --git a/CHANGELOG.md b/CHANGELOG.md old mode 100644 new mode 100755 diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md old mode 100644 new mode 100755 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md old mode 100644 new mode 100755 diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/NOTICE b/NOTICE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/pom.xml b/pom.xml old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/codegen/codegenML1.nal b/src/main/java/org/opennars/lab/codegen/codegenML1.nal old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/grid2d/gui/EditorPanel.java b/src/main/java/org/opennars/lab/grid2d/gui/EditorPanel.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/grid2d/main/Action.java b/src/main/java/org/opennars/lab/grid2d/main/Action.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/grid2d/main/Cell.java b/src/main/java/org/opennars/lab/grid2d/main/Cell.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/grid2d/main/CellFunction.java b/src/main/java/org/opennars/lab/grid2d/main/CellFunction.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/grid2d/main/CellState.java b/src/main/java/org/opennars/lab/grid2d/main/CellState.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/grid2d/main/Effect.java b/src/main/java/org/opennars/lab/grid2d/main/Effect.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/grid2d/main/Grid2DSpace.java b/src/main/java/org/opennars/lab/grid2d/main/Grid2DSpace.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/grid2d/main/GridAgent.java b/src/main/java/org/opennars/lab/grid2d/main/GridAgent.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/grid2d/main/GridObject.java b/src/main/java/org/opennars/lab/grid2d/main/GridObject.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/grid2d/main/Hauto.java b/src/main/java/org/opennars/lab/grid2d/main/Hauto.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/grid2d/main/LocalGridObject.java b/src/main/java/org/opennars/lab/grid2d/main/LocalGridObject.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/grid2d/main/RayVision.java b/src/main/java/org/opennars/lab/grid2d/main/RayVision.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/grid2d/main/SimplexNoise.java b/src/main/java/org/opennars/lab/grid2d/main/SimplexNoise.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/grid2d/main/TestChamber.java b/src/main/java/org/opennars/lab/grid2d/main/TestChamber.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/grid2d/map/Cave.java b/src/main/java/org/opennars/lab/grid2d/map/Cave.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/grid2d/map/Dungeon.java b/src/main/java/org/opennars/lab/grid2d/map/Dungeon.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/grid2d/map/Maze.java b/src/main/java/org/opennars/lab/grid2d/map/Maze.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/grid2d/object/Door.java b/src/main/java/org/opennars/lab/grid2d/object/Door.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/grid2d/object/Key.java b/src/main/java/org/opennars/lab/grid2d/object/Key.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/grid2d/object/Pizza.java b/src/main/java/org/opennars/lab/grid2d/object/Pizza.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/grid2d/operator/Activate.java b/src/main/java/org/opennars/lab/grid2d/operator/Activate.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/grid2d/operator/Deactivate.java b/src/main/java/org/opennars/lab/grid2d/operator/Deactivate.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/grid2d/operator/Goto.java b/src/main/java/org/opennars/lab/grid2d/operator/Goto.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/grid2d/operator/Pick.java b/src/main/java/org/opennars/lab/grid2d/operator/Pick.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/language/LanguageGUI.form b/src/main/java/org/opennars/lab/language/LanguageGUI.form old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/language/LanguageGUI.java b/src/main/java/org/opennars/lab/language/LanguageGUI.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/launcher/Launcher.form b/src/main/java/org/opennars/lab/launcher/Launcher.form old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/launcher/Launcher.java b/src/main/java/org/opennars/lab/launcher/Launcher.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/launcher/NARGame.java b/src/main/java/org/opennars/lab/launcher/NARGame.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/lazyminer/LazyMiner.java b/src/main/java/org/opennars/lab/lazyminer/LazyMiner.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/lazyminer/Main.java b/src/main/java/org/opennars/lab/lazyminer/Main.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/lazyminer/PatientSimulator.java b/src/main/java/org/opennars/lab/lazyminer/PatientSimulator.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/microworld/Pong.java b/src/main/java/org/opennars/lab/microworld/Pong.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/microworld/PongComplex.java b/src/main/java/org/opennars/lab/microworld/PongComplex.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/microworld/SimNAR.java b/src/main/java/org/opennars/lab/microworld/SimNAR.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/microworld/SupervisedRecognition.java b/src/main/java/org/opennars/lab/microworld/SupervisedRecognition.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/nalnet/NALNetEditor.java b/src/main/java/org/opennars/lab/nalnet/NALNetEditor.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/nalnet/NALNetwork.java b/src/main/java/org/opennars/lab/nalnet/NALNetwork.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/operator/MathExpression.java b/src/main/java/org/opennars/lab/operator/MathExpression.java old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/plugin/input/PerceptionAccel.java b/src/main/java/org/opennars/lab/plugin/input/PerceptionAccel.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/plugin/mental/GlobalAnticipation.java b/src/main/java/org/opennars/lab/plugin/mental/GlobalAnticipation.java old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 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 old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/tictactoe/GridButtonPanel.java b/src/main/java/org/opennars/lab/tictactoe/GridButtonPanel.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/tictactoe/TicTacToe.java b/src/main/java/org/opennars/lab/tictactoe/TicTacToe.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/vision/ConcatVisionChannel.java b/src/main/java/org/opennars/lab/vision/ConcatVisionChannel.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/vision/RasterHierachy.java b/src/main/java/org/opennars/lab/vision/RasterHierachy.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/vision/SpatialSamplingVisionChannel.java b/src/main/java/org/opennars/lab/vision/SpatialSamplingVisionChannel.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/vision/SymRecognizer.form b/src/main/java/org/opennars/lab/vision/SymRecognizer.form old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/vision/SymRecognizer.java b/src/main/java/org/opennars/lab/vision/SymRecognizer.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/vision/SymRecognizerWithVisionChannel.form b/src/main/java/org/opennars/lab/vision/SymRecognizerWithVisionChannel.form old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/lab/vision/SymRecognizerWithVisionChannel.java b/src/main/java/org/opennars/lab/vision/SymRecognizerWithVisionChannel.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/util/io/ChangedTextInput.java b/src/main/java/org/opennars/util/io/ChangedTextInput.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/util/io/ExampleFileInput.java b/src/main/java/org/opennars/util/io/ExampleFileInput.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/util/io/KeyboardInputExample.java b/src/main/java/org/opennars/util/io/KeyboardInputExample.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/util/test/ConceptMonitor.java b/src/main/java/org/opennars/util/test/ConceptMonitor.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/util/test/OutputCondition.java b/src/main/java/org/opennars/util/test/OutputCondition.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/util/test/OutputContainsCondition.java b/src/main/java/org/opennars/util/test/OutputContainsCondition.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/util/test/OutputEmptyCondition.java b/src/main/java/org/opennars/util/test/OutputEmptyCondition.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/util/test/OutputNotContainsCondition.java b/src/main/java/org/opennars/util/test/OutputNotContainsCondition.java old mode 100644 new mode 100755 diff --git a/src/main/java/org/opennars/util/test/TuneTuffy.java b/src/main/java/org/opennars/util/test/TuneTuffy.java old mode 100644 new mode 100755 diff --git a/src/main/resources/grid2d/and_switch_light.lvl b/src/main/resources/grid2d/and_switch_light.lvl old mode 100644 new mode 100755 diff --git a/src/main/resources/grid2d/complex1.lvl b/src/main/resources/grid2d/complex1.lvl old mode 100644 new mode 100755 diff --git a/src/main/resources/grid2d/dont_switch.lvl b/src/main/resources/grid2d/dont_switch.lvl old mode 100644 new mode 100755 diff --git a/src/main/resources/grid2d/dont_switch2.lvl b/src/main/resources/grid2d/dont_switch2.lvl old mode 100644 new mode 100755 diff --git a/src/main/resources/grid2d/ex4.lvl b/src/main/resources/grid2d/ex4.lvl old mode 100644 new mode 100755 diff --git a/src/main/resources/grid2d/freq_generator.lvl b/src/main/resources/grid2d/freq_generator.lvl old mode 100644 new mode 100755 diff --git a/src/main/resources/grid2d/house.lvl b/src/main/resources/grid2d/house.lvl old mode 100644 new mode 100755 diff --git a/src/main/resources/grid2d/key2.lvl b/src/main/resources/grid2d/key2.lvl old mode 100644 new mode 100755 diff --git a/src/main/resources/grid2d/pizzamaschine.lvl b/src/main/resources/grid2d/pizzamaschine.lvl old mode 100644 new mode 100755 diff --git a/src/main/resources/grid2d/pizzeria.lvl b/src/main/resources/grid2d/pizzeria.lvl old mode 100644 new mode 100755 diff --git a/src/main/resources/grid2d/simple.lvl b/src/main/resources/grid2d/simple.lvl old mode 100644 new mode 100755 diff --git a/src/main/resources/grid2d/switchX4.lvl b/src/main/resources/grid2d/switchX4.lvl old mode 100644 new mode 100755 diff --git a/src/main/resources/grid2d/switch_door_switch_light.lvl b/src/main/resources/grid2d/switch_door_switch_light.lvl old mode 100644 new mode 100755 diff --git a/src/main/resources/grid2d/uncertain_event.lvl b/src/main/resources/grid2d/uncertain_event.lvl old mode 100644 new mode 100755 diff --git a/src/main/resources/grid2d/uncertain_state.lvl b/src/main/resources/grid2d/uncertain_state.lvl old mode 100644 new mode 100755 diff --git a/src/main/resources/language/language_knowledge.nal b/src/main/resources/language/language_knowledge.nal old mode 100644 new mode 100755 diff --git a/src/main/resources/launcher/microworld.png b/src/main/resources/launcher/microworld.png old mode 100644 new mode 100755 diff --git a/src/main/resources/launcher/nlp.png b/src/main/resources/launcher/nlp.png old mode 100644 new mode 100755 diff --git a/src/main/resources/launcher/opennars_logo.png b/src/main/resources/launcher/opennars_logo.png old mode 100644 new mode 100755 diff --git a/src/main/resources/launcher/pong.png b/src/main/resources/launcher/pong.png old mode 100644 new mode 100755 diff --git a/src/main/resources/launcher/predict.png b/src/main/resources/launcher/predict.png old mode 100644 new mode 100755 diff --git a/src/main/resources/launcher/rover.png b/src/main/resources/launcher/rover.png old mode 100644 new mode 100755 diff --git a/src/main/resources/launcher/testchamber.png b/src/main/resources/launcher/testchamber.png old mode 100644 new mode 100755 diff --git a/src/main/resources/microworld/agent.png b/src/main/resources/microworld/agent.png old mode 100644 new mode 100755 diff --git a/src/main/resources/microworld/ball.png b/src/main/resources/microworld/ball.png old mode 100644 new mode 100755 diff --git a/src/main/resources/microworld/bar.png b/src/main/resources/microworld/bar.png old mode 100644 new mode 100755 diff --git a/src/main/resources/microworld/fire.png b/src/main/resources/microworld/fire.png old mode 100644 new mode 100755 diff --git a/src/main/resources/microworld/food.png b/src/main/resources/microworld/food.png old mode 100644 new mode 100755 From e54c591b86ee7ef16527cfbd8aae5cda36e230e2 Mon Sep 17 00:00:00 2001 From: Patrick Hammer Date: Thu, 27 Dec 2018 17:38:27 +0000 Subject: [PATCH 3/4] Update: Bag: Bag from v1.5.5 is back, sseehh's modifications weren't clean enough to be maintainable even after my cleanups. --- .../org/opennars/lab/grid2d/gui/EditorPanel.java | 2 +- .../lab/plugin/app/farg/FluidAnalogiesAgents.java | 4 ++-- .../org/opennars/lab/plugin/app/farg/Workspace.java | 6 +++--- .../lab/vision/SpatialSamplingVisionChannel.java | 12 ++++++------ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/opennars/lab/grid2d/gui/EditorPanel.java b/src/main/java/org/opennars/lab/grid2d/gui/EditorPanel.java index 319a5164..79eb4e3c 100755 --- 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/plugin/app/farg/FluidAnalogiesAgents.java b/src/main/java/org/opennars/lab/plugin/app/farg/FluidAnalogiesAgents.java index 906b7dda..57d258fa 100755 --- 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 coderack; + Bag 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 index e03bb7d2..7368c677 100755 --- 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/vision/SpatialSamplingVisionChannel.java b/src/main/java/org/opennars/lab/vision/SpatialSamplingVisionChannel.java index e9c2140e..6484a3cc 100755 --- 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,Sentence>[][] spatialbag; + Bag,Sentence>[][] 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); @@ -69,7 +69,7 @@ public void step_start(final Timable time) { int ind = 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: @@ -77,7 +77,7 @@ public void step_start(final Timable time) 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 seq = proceedWithTemporalInduction(sampled.sentence, sampled2.sentence, sampled2, From e14568dae5eaeb33450b09549b4ec29fea4b64fd Mon Sep 17 00:00:00 2001 From: Patrick Hammer Date: Sat, 29 Dec 2018 10:52:39 +0000 Subject: [PATCH 4/4] Update: Memory: RandomNumber not static anymore. --- src/main/java/org/opennars/lab/grid2d/main/Hauto.java | 4 +++- src/main/java/org/opennars/lab/language/LanguageGUI.java | 2 +- .../org/opennars/lab/plugin/mental/GlobalAnticipation.java | 4 ++-- .../org/opennars/lab/vision/SpatialSamplingVisionChannel.java | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/opennars/lab/grid2d/main/Hauto.java b/src/main/java/org/opennars/lab/grid2d/main/Hauto.java index 28a07e1a..bc3083eb 100755 --- 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/language/LanguageGUI.java b/src/main/java/org/opennars/lab/language/LanguageGUI.java index fa80ec4d..813d5d64 100755 --- 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/plugin/mental/GlobalAnticipation.java b/src/main/java/org/opennars/lab/plugin/mental/GlobalAnticipation.java index 46eac2d8..d0e323c7 100755 --- 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/vision/SpatialSamplingVisionChannel.java b/src/main/java/org/opennars/lab/vision/SpatialSamplingVisionChannel.java index 6484a3cc..4f544719 100755 --- a/src/main/java/org/opennars/lab/vision/SpatialSamplingVisionChannel.java +++ b/src/main/java/org/opennars/lab/vision/SpatialSamplingVisionChannel.java @@ -67,13 +67,13 @@ 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].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) {