working on image reading

FultonBrowne · Feb 18, 2020 · 539a761 · 539a761
1 parent d7a78e8
commit 539a761
Show file tree

Hide file tree

Showing 23 changed files with 46 additions and 22 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/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
+/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/StructuredData.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/demos/readers/GetReader.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/demos/readers/TSV.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/demos/scripts/BasicDemo.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/demos/scripts/Image.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/demos/scripts/VoiceScript.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/demos/util/RunOnGpu$kernel$1.class:/home/fulton/Desktop/code/mars/build/classes/java/main/com/andromeda/mars/demos/util/RunOnGpu.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/CellBase.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/brain/StructuredData.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/demos/readers/GetReader.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/demos/readers/TSV.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/demos/scripts/BasicDemo.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/demos/scripts/Image.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/demos/scripts/VoiceScript.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/demos/util/RunOnGpu$kernel$1.class:/home/fulton/Desktop/code/mars/build/classes/kotlin/main/com/andromeda/mars/demos/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/brain/CellBase.kt b/src/main/java/com/andromeda/mars/brain/CellBase.kt
@@ -46,7 +46,7 @@ open class CellBase {
         val parsed = arrayListOf<StructuredData>()
         structuredData.forEach {
             val intArray = arrayListOf<Int>()
-            println(it.data)
+            println(it.data.size)
             it.data.forEachIndexed { index, i ->
                 intArray.add((i - newData[index]).absoluteValue)
             }

diff --git a/src/main/java/com/andromeda/mars/brain/StructuredData.kt b/src/main/java/com/andromeda/mars/brain/StructuredData.kt
@@ -1,9 +1,14 @@
 package com.andromeda.mars.brain
 
-class StructuredData(val label:Any, val data:ArrayList<Int> ) {
+class StructuredData(val label:Any, var data:ArrayList<Int> ) {
     fun addData(newData:ArrayList<Int>, cellBase: CellBase){
+        val newVal = arrayListOf<Int>()
         newData.forEachIndexed { index, t ->
-            cellBase.operation(t, data[index])
+            newVal.add(cellBase.operation(t, data[index]))
+            newVal.reverse()
+            data = newVal
+            println(data.size)
+
         }
     }
 }
diff --git a/src/main/java/com/andromeda/mars/demos/scripts/Image.kt b/src/main/java/com/andromeda/mars/demos/scripts/Image.kt
@@ -10,6 +10,7 @@ import java.io.ObjectInputStream
 class Image {
     //read the cifar-10 dataset
     fun main(){
+        println("start")
         val cell = CellBase()
         val file = File(readLine()!!)
         val fis = FileInputStream(file)