y position of posint fixed

AntonAsmirko · Mar 25, 2021 · f96936e · f96936e
1 parent 3c033f8
commit f96936e
Show file tree

Hide file tree

Showing 67 changed files with 27 additions and 16 deletions.
diff --git a/.gradle/6.7.1/executionHistory/executionHistory.bin b/.gradle/6.7.1/executionHistory/executionHistory.bin
diff --git a/.gradle/6.7.1/executionHistory/executionHistory.lock b/.gradle/6.7.1/executionHistory/executionHistory.lock
diff --git a/.gradle/6.7.1/fileHashes/fileHashes.bin b/.gradle/6.7.1/fileHashes/fileHashes.bin
diff --git a/.gradle/6.7.1/fileHashes/fileHashes.lock b/.gradle/6.7.1/fileHashes/fileHashes.lock
diff --git a/.gradle/6.7.1/fileHashes/resourceHashesCache.bin b/.gradle/6.7.1/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/6.7.1/javaCompile/classAnalysis.bin b/.gradle/6.7.1/javaCompile/classAnalysis.bin
diff --git a/.gradle/6.7.1/javaCompile/jarAnalysis.bin b/.gradle/6.7.1/javaCompile/jarAnalysis.bin
diff --git a/.gradle/6.7.1/javaCompile/javaCompile.lock b/.gradle/6.7.1/javaCompile/javaCompile.lock
diff --git a/.gradle/6.7.1/javaCompile/taskHistory.bin b/.gradle/6.7.1/javaCompile/taskHistory.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/build/classes/java/main/firstLab/Optimizer$Pair.class b/build/classes/java/main/firstLab/Optimizer$Pair.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$14$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$14$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$1$15$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$1$15$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$2$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$2$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$3$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$3$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$4$1.class b/build/classes/kotlin/main/MainKt$main$1$1$1$4$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1$1$5.class b/build/classes/kotlin/main/MainKt$main$1$1$1$5.class
diff --git a/build/classes/kotlin/main/MainKt$main$1$1.class b/build/classes/kotlin/main/MainKt$main$1$1.class
diff --git a/build/classes/kotlin/main/MainKt$main$1.class b/build/classes/kotlin/main/MainKt$main$1.class
diff --git a/build/classes/kotlin/main/MainKt$sam$java_util_function_Function$0.class b/build/classes/kotlin/main/MainKt$sam$java_util_function_Function$0.class
diff --git a/build/classes/kotlin/main/MainKt.class b/build/classes/kotlin/main/MainKt.class
diff --git a/build/classes/kotlin/main/composables/PlotComposableKt$plotView$1.class b/build/classes/kotlin/main/composables/PlotComposableKt$plotView$1.class
diff --git a/build/classes/kotlin/main/composables/PlotComposableKt$plotView$2.class b/build/classes/kotlin/main/composables/PlotComposableKt$plotView$2.class
diff --git a/build/classes/kotlin/main/composables/PlotComposableKt.class b/build/classes/kotlin/main/composables/PlotComposableKt.class
diff --git a/build/classes/kotlin/main/extensions/CanvasSextensionsKt.class b/build/classes/kotlin/main/extensions/CanvasSextensionsKt.class
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.values b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values
diff --git a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.s b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.s
@@ -1 +1 @@
-��������������������
+�������������������������
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.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
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.values b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.s b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.s
@@ -1 +1 @@
-β	ΪΪΪαεηςςςςΜ	οηκΓ	όαϊ
+т	ккксхчђђђђЬ	ячъУ	ќсњи	и	и	Ш	Ф	
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/java-sources-proto-map.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at
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.values b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.s b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.s
@@ -1 +1 @@
-�Z�X�V�V�V�U�T�T�T�S�R�Q�U
+챘쑖쑖쁖셕핔���화
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/jvm/kotlin/source-to-classes.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab
@@ -1,2 +1,2 @@
-63
-50
+71
+58
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.values.at b/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at
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/id-to-file.tab.keystream b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i
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.keystream b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.s b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.s
@@ -1 +1 @@
-έςΙ.α6Γ)Ϋ'Ρ$ΰ'Ο(ά Ϊ$εΣ"γβΛθΗΟοοΩΩάΩχΗΥΚωψθαβφΦχΘΙΕ'π�Α*ψ%ψ$π"χύ"ςΐΔΪοΦαπθΓΡ%ω#ΦχέύυΜΧ%ρϊ$
+έςΙ.α6Γ)Ϋ'Ρ$ΰ'Ο(ά Ϊ$εΣ"γβΛθΗΟοοΩΩάΩχΗΥΚωψθαβφΦχΘΙΕ'π�Α*ψ%ψ$π"χύ"ςΐΔΪοΦαπθΓΡ%ω#ΦχέύυΜΧ%ρϊ$Ο,Ω,Η,ΛΚό!άΑ(ά*ΐΪΘ(δ

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/src/main/java/firstLab/Optimizer.java b/src/main/java/firstLab/Optimizer.java
@@ -57,7 +57,7 @@ static Double toDouble(Object s) {
 
     public static class Pair <T> {
         public T first, second;
-        Pair(T a, T b) {
+        public Pair(T a, T b) {
             this.first = a;
             this.second = b;
         }

diff --git a/src/main/kotlin/composables/PlotComposable.kt b/src/main/kotlin/composables/PlotComposable.kt
@@ -26,7 +26,7 @@ fun plotView(
     cursorPosition: Offset?,
     cursorDrawingPermitted: Boolean,
     themeColors: Colors,
-    allOptimizersSteps: ArrayList<ArrayList<Optimizer.Pair<Double>>>,
+    allOptimizersSteps: List<List<Optimizer.Pair<Float>>>,
     currentStep: Int
 ) {
     val paint by remember { mutableStateOf(Paint()) }

diff --git a/src/main/kotlin/extensions/CanvasSextensions.kt b/src/main/kotlin/extensions/CanvasSextensions.kt
@@ -85,7 +85,7 @@ fun Canvas.prepareAxis(
 }
 
 fun Canvas.drawStep(
-    allOptimizersSteps: ArrayList<ArrayList<Optimizer.Pair<Double>>>,
+    allOptimizersSteps: List<List<Optimizer.Pair<Float>>>,
     currentStep: Int,
     scaleX: Float,
     scaleY: Float,
@@ -101,11 +101,15 @@ fun Canvas.drawStep(
         else -> allOptimizersSteps[currentStep]
     }
 
+    println("$currentStep ${allOptimizersSteps.size}")
+
     currentPoint.forEach {
 
+        println("${it.first} ${it.second}")
+
         val pointToDraw = Offset(
-            (it.first.toFloat() - lBound) * scaleX,
-            (it.second.toFloat() - minFnVal) * scaleY
+            (it.first - lBound) * scaleX,
+            (it.second - minFnVal) * scaleY
         )
 
         drawCircle(pointToDraw, 10f, paint)

diff --git a/src/main/kotlin/main.kt b/src/main/kotlin/main.kt
@@ -188,21 +188,19 @@ fun main() = Window(
                                 MaterialTheme.colors
                             ) {
                                 functionDrawingPermitted = validateInput(stepSize)
-                                if(functionDrawingPermitted) {
+                                if (functionDrawingPermitted) {
                                     currentOptimizerStep += stepSize.toInt()
                                 }
-                                println(currentOptimizerStep)
                             }
                             fieldSpacer()
                             buttonInBox(
                                 Constants.PREV_ITERATION,
                                 MaterialTheme.colors
                             ) {
                                 functionDrawingPermitted = validateInput(stepSize)
-                                if(functionDrawingPermitted) {
+                                if (functionDrawingPermitted) {
                                     currentOptimizerStep -= stepSize.toInt()
                                 }
-                                println(currentOptimizerStep)
                             }
                         }
                     }
@@ -257,7 +255,16 @@ fun main() = Window(
                                 cursorPosition,
                                 clickPermitted,
                                 MaterialTheme.colors,
-                                array,
+                                array
+                                    .map {
+                                        it.map { p ->
+                                            val xFlt = p.first.toFloat()
+                                            Optimizer.Pair<Float>(
+                                                p.first.toFloat(),
+                                                functionsButtonsText[func]!!.invoke(xFlt)
+                                            )
+                                        }
+                                    },
                                 currentOptimizerStep
                             )
                         } ?: textCentred(
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		β ΪΪΪαεηςςςςΜ οηκΓ όαϊ
		т ккксхчђђђђЬ ячъУ ќсњи и и Ш Ф
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		�Z�X�V�V�V�U�T�T�T�S�R�Q�U
		챘쑖쑖쁖셕핔���화
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		έςΙ.α6Γ)Ϋ'Ρ$ΰ'Ο(ά Ϊ$εΣ"γβΛθΗΟοοΩΩάΩχΗΥΚωψθαβφΦχΘΙΕ'π�Α*ψ%ψ$π"χύ"ςΐΔΪοΦαπθΓΡ%ω#ΦχέύυΜΧ%ρϊ$
		έςΙ.α6Γ)Ϋ'Ρ$ΰ'Ο(ά Ϊ$εΣ"γβΛθΗΟοοΩΩάΩχΗΥΚωψθαβφΦχΘΙΕ'π�Αψ%ψ$π"χύ"ςΐΔΪοΦαπθΓΡ%ω#ΦχέύυΜΧ%ρϊ$Ο,Ω,Η,ΛΚό!άΑ(άΐΪΘ(δ
Expand Down