got stuff polished

FultonBrowne · Feb 15, 2020 · 4105d5f · 4105d5f
1 parent 1680854
commit 4105d5f
Show file tree

Hide file tree

Showing 27 changed files with 56 additions and 198 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/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/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/proto.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab
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/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/last-build.bin b/build/kotlin/compileKotlin/last-build.bin
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/Brain.kt b/src/main/java/com/andromeda/mars/brain/Brain.kt
diff --git a/src/main/java/com/andromeda/mars/brain/BrainType.kt b/src/main/java/com/andromeda/mars/brain/BrainType.kt
diff --git a/src/main/java/com/andromeda/mars/brain/CLI.kt b/src/main/java/com/andromeda/mars/brain/CLI.kt
diff --git a/src/main/java/com/andromeda/mars/brain/Cell.kt b/src/main/java/com/andromeda/mars/brain/Cell.kt
diff --git a/src/main/java/com/andromeda/mars/brain/CellBase.kt b/src/main/java/com/andromeda/mars/brain/CellBase.kt
@@ -2,64 +2,15 @@
 
 package com.andromeda.mars.brain
 
-import com.andromeda.mars.models.StructuredData
 import kotlin.math.absoluteValue
 
-open class CellBase(u: Int) {
+open class CellBase {
     var isRunning = true
-    private val unitSize = u
-    private var finalData = 0
-    private val dataForMatch = arrayListOf<Int>()
     val structuredData = arrayListOf<StructuredData>()
     var useDefaultOperation = true
-    var dataScript = ""
+    val cells = arrayListOf<CellBase>()
 
 
-    private val data = arrayListOf<Int>()
-     val cells = arrayListOf<CellBase>()
-
-    open fun dataToCell(newData:Int){
-        if(isRunning)data.add(newData)
-        else return
-        if (data.size == unitSize){
-            isRunning = false
-            println(cells.size)
-                val newData2 = data
-
-                for (it in newData2) {
-                    finalData = if (finalData == 0) it
-                    else finalData.xor(it)
-                    dataOutOfCell(finalData)
-
-                }
-                data.clear()
-            isRunning = true
-        }
-
-    }
-    open fun dataToCell(newData:Int, label:Int){
-        if(isRunning)dataForMatch.add(newData)
-        else return
-        if (dataForMatch.size == unitSize){
-            isRunning = false
-            for (i in structuredData) {
-                if (i.label == label){
-                    i.addData(dataForMatch, this)
-                    dataForMatch.clear()
-                    isRunning = true
-                    return
-                }
-            }
-            structuredData.add(StructuredData(label, dataForMatch))
-            dataForMatch.clear()
-            isRunning = true
-
-
-
-        }
-
-
-    }
     open fun dataToCell(newData:ArrayList<Int>, label:Int){
             isRunning = false
             for (i in structuredData) {
@@ -71,30 +22,19 @@ open class CellBase(u: Int) {
 
             }
             structuredData.add(StructuredData(label, newData))
-            dataForMatch.clear()
             isRunning = true
 
 
 
     }
     open fun dataToCell(newData:ArrayList<Int>, label:String){
-        if(isRunning)dataForMatch.addAll(newData)
-        else return
-        if (dataForMatch.size == unitSize){
-            isRunning = false
             for (i in structuredData) {
                 if (i.label == label){
-                    i.addData(dataForMatch, this)
-                    dataForMatch.clear()
+                    i.addData(newData, this)
                     isRunning = true
                     return
                 }
-
-            }
-            structuredData.add(StructuredData(label, dataForMatch))
-            structuredData.add(StructuredData(label, dataForMatch))
-            dataForMatch.clear()
-            isRunning = true
+            structuredData.add(StructuredData(label, newData))
 
 
 
@@ -126,17 +66,7 @@ open class CellBase(u: Int) {
         }
         return lowest
     }
-    open fun dataOutOfCell(toSend:Int){
-        println(toSend)
-        try {
-            cells.forEach {
-                it.dataToCell(toSend)
-            }
-        }
-        catch (e:Exception){
-            e.printStackTrace()
-        }
-    }
+
     fun operation(newData: Int, oldData:Int): Int {
         if (!useDefaultOperation){
             return scriptedOperation()

diff --git a/src/main/java/com/andromeda/mars/brain/Generate.kt b/src/main/java/com/andromeda/mars/brain/Generate.kt
diff --git a/...m/andromeda/mars/models/StructuredData.kt → ...om/andromeda/mars/brain/StructuredData.kt b/...m/andromeda/mars/models/StructuredData.kt → ...om/andromeda/mars/brain/StructuredData.kt
@@ -1,6 +1,4 @@
-package com.andromeda.mars.models
-
-import com.andromeda.mars.brain.CellBase
+package com.andromeda.mars.brain
 
 class StructuredData(val label:Any, val data:ArrayList<Int> ) {
     fun addData(newData:ArrayList<Int>, cellBase: CellBase){

diff --git a/...a/com/andromeda/mars/readers/GetReader.kt → ...andromeda/mars/demos/readers/GetReader.kt b/...a/com/andromeda/mars/readers/GetReader.kt → ...andromeda/mars/demos/readers/GetReader.kt
@@ -1,4 +1,4 @@
-package com.andromeda.mars.readers
+package com.andromeda.mars.demos.readers
 
 import java.io.InputStreamReader
 class GetReader {

diff --git a/...in/java/com/andromeda/mars/readers/TSV.kt → ...a/com/andromeda/mars/demos/readers/TSV.kt b/...in/java/com/andromeda/mars/readers/TSV.kt → ...a/com/andromeda/mars/demos/readers/TSV.kt
@@ -1,4 +1,4 @@
-package com.andromeda.mars.readers
+package com.andromeda.mars.demos.readers
 
 import com.univocity.parsers.tsv.TsvParser
 import com.univocity.parsers.tsv.TsvParserSettings