From 228c0b3886862a0b1a03d18ba5e9b366ccd994d4 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 28 Jan 2021 20:04:33 +0300
Subject: [PATCH] misc

---
 examples/build.gradle.kts                      |  3 ++-
 kmath-histograms/build.gradle.kts              | 18 ++++++++++++++----
 .../histogram/MultivariateHistogramTest.kt     |  1 -
 .../kmath/histogram/UnivariateHistogram.kt     | 11 ++++++-----
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index c079eaa84..4e780ff36 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -68,11 +68,12 @@ benchmark {
     targets.register("benchmarks")
     // This one matches sourceSet name above
 
-    configurations.register("fast") {
+    configurations.register("dot") {
         warmups = 1 // number of warmup iterations
         iterations = 3 // number of iterations
         iterationTime = 500 // time in seconds per iteration
         iterationTimeUnit = "ms" // time unity for iterationTime, default is seconds
+        include("DotBenchmark")
     }
 }
 
diff --git a/kmath-histograms/build.gradle.kts b/kmath-histograms/build.gradle.kts
index 7de21ad89..40196416e 100644
--- a/kmath-histograms/build.gradle.kts
+++ b/kmath-histograms/build.gradle.kts
@@ -1,8 +1,18 @@
 plugins { id("ru.mipt.npm.mpp") }
 
-kotlin.sourceSets.commonMain {
-    dependencies {
-        api(project(":kmath-core"))
-        api(project(":kmath-for-real"))
+kotlin.sourceSets {
+    commonMain {
+        dependencies {
+            api(project(":kmath-core"))
+        }
+    }
+    commonTest{
+        dependencies{
+            implementation(project(":kmath-for-real"))
+        }
     }
 }
+
+readme {
+    this.maturity = ru.mipt.npm.gradle.Maturity.PROTOTYPE
+}
diff --git a/kmath-histograms/src/commonTest/kotlin/scietifik/kmath/histogram/MultivariateHistogramTest.kt b/kmath-histograms/src/commonTest/kotlin/scietifik/kmath/histogram/MultivariateHistogramTest.kt
index af22afc6b..87a2b3e68 100644
--- a/kmath-histograms/src/commonTest/kotlin/scietifik/kmath/histogram/MultivariateHistogramTest.kt
+++ b/kmath-histograms/src/commonTest/kotlin/scietifik/kmath/histogram/MultivariateHistogramTest.kt
@@ -5,7 +5,6 @@ import kscience.kmath.histogram.fill
 import kscience.kmath.histogram.put
 import kscience.kmath.real.RealVector
 import kscience.kmath.real.invoke
-import kscience.kmath.structures.Buffer
 import kotlin.random.Random
 import kotlin.test.*
 
diff --git a/kmath-histograms/src/jvmMain/kotlin/kscience/kmath/histogram/UnivariateHistogram.kt b/kmath-histograms/src/jvmMain/kotlin/kscience/kmath/histogram/UnivariateHistogram.kt
index 2f3855892..d07c2ba01 100644
--- a/kmath-histograms/src/jvmMain/kotlin/kscience/kmath/histogram/UnivariateHistogram.kt
+++ b/kmath-histograms/src/jvmMain/kotlin/kscience/kmath/histogram/UnivariateHistogram.kt
@@ -1,6 +1,6 @@
 package kscience.kmath.histogram
 
-import kscience.kmath.real.RealVector
+import kscience.kmath.linear.Point
 import kscience.kmath.structures.Buffer
 import kscience.kmath.structures.asBuffer
 import java.util.*
@@ -11,12 +11,12 @@ import kotlin.math.floor
 public class UnivariateBin(
     public val position: Double,
     public val size: Double,
-    public val counter: LongCounter = LongCounter()
+    public val counter: LongCounter = LongCounter(),
 ) : Bin<Double> {
     //TODO add weighting
     public override val value: Number get() = counter.sum()
 
-    public override val center: RealVector get() = doubleArrayOf(position).asBuffer()
+    public override val center: Point<Double> get() = doubleArrayOf(position).asBuffer()
     public override val dimension: Int get() = 1
 
     public operator fun contains(value: Double): Boolean = value in (position - size / 2)..(position + size / 2)
@@ -27,8 +27,9 @@ public class UnivariateBin(
 /**
  * Univariate histogram with log(n) bin search speed
  */
-public class UnivariateHistogram private constructor(private val factory: (Double) -> UnivariateBin) :
-    MutableHistogram<Double, UnivariateBin> {
+public class UnivariateHistogram private constructor(
+    private val factory: (Double) -> UnivariateBin,
+) : MutableHistogram<Double, UnivariateBin> {
 
     private val bins: TreeMap<Double, UnivariateBin> = TreeMap()