first basic test works

FultonBrowne · Feb 14, 2020 · 080e698 · 080e698
1 parent 3ea6c82
commit 080e698
Show file tree

Hide file tree

Showing 22 changed files with 56 additions and 27 deletions.
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/build/kotlin/compileKotlin/build-history.bin b/build/kotlin/compileKotlin/build-history.bin
diff --git a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab_i b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab_i
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab_i b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab_i
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab_i b/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab_i
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i
diff --git a/build/kotlin/compileKotlin/last-build.bin b/build/kotlin/compileKotlin/last-build.bin
diff --git a/build/kotlin/mars121jar-classes.txt b/build/kotlin/mars121jar-classes.txt
@@ -1 +1 @@
-/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/brain/Brain.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/brain/BrainType.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/brain/CLI.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/brain/Cell.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/brain/CellBase.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/brain/Generate.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/modelBased/Data.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/modelBased/MasterML.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/modelBased/Trainer.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/run.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/brain/BasicDemo$main$inputThread$1$refresh$1.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/brain/BasicDemo$main$inputThread$1.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/brain/BasicDemo.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/brain/Brain.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/brain/BrainType.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/brain/CLI.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/brain/Cell.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/brain/CellBase.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/brain/Generate.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/inputSources/Camera.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/models/StructuredData.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/scripts/VoiceScript.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/util/RunOnGpu$kernel$1.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/util/RunOnGpu.class
+/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/brain/Brain.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/brain/BrainType.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/brain/CLI.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/brain/Cell.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/brain/CellBase.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/brain/Generate.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/inputSources/Camera.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/models/StructuredData.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/readers/GetReader.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/readers/TSV.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/run.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/scripts/BasicDemo.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/scripts/VoiceScript.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/util/RunOnGpu$kernel$1.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/util/RunOnGpu.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/brain/Brain.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/brain/BrainType.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/brain/CLI.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/brain/Cell.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/brain/CellBase.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/brain/Generate.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/inputSources/Camera.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/models/StructuredData.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/readers/GetReader.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/readers/TSV.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/scripts/BasicDemo.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/scripts/VoiceScript.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/util/RunOnGpu$kernel$1.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/util/RunOnGpu.class
diff --git a/build/libs/mars-1.2.1.jar b/build/libs/mars-1.2.1.jar
diff --git a/src/main/java/com/andromeda/mars/run.java b/src/main/java/com/andromeda/mars/run.java
@@ -1,12 +1,21 @@
 package com.andromeda.mars;
 
 import com.andromeda.mars.brain.CLI;
+import com.andromeda.mars.scripts.BasicDemo;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
 public class run {
     @Contract(pure = true)
-    public static void main(@NotNull String[] args){
-        new CLI().main();
+    public static void main(@NotNull String[] args) throws IOException {
+        System.out.println("run basic test 1 y or n");
+        BufferedReader obj = new BufferedReader(new InputStreamReader(System.in));
+        String readLine = obj.readLine();
+        if(readLine.equals("y")) new BasicDemo().main();
+        else new CLI().main();
     }
 }
diff --git a/src/main/java/com/andromeda/mars/scripts/BasicDemo.kt b/src/main/java/com/andromeda/mars/scripts/BasicDemo.kt
@@ -4,10 +4,9 @@ import com.andromeda.mars.brain.Generate
 
 class BasicDemo {
     fun main(){
-        val cell = Generate().singleTrain(700, 4)
-        val inputThread = Thread {
-
-        }
-        inputThread.start()
+        val cell = Generate().amlModel( 4)
+        cell.dataToCell(arrayListOf(0, 0, 2, 0), 0)
+        val recognize = cell.recognize(arrayListOf(0, 0, 2, 0))
+        println(recognize)
     }
 }