remove sampling

Author: AndreiKingsley

ggdsl-lets-plot/src/main/kotlin/org/jetbrains/kotlinx/ggdsl/letsplot/translator/LayerWrapper.kt

@@ -5,15 +5,16 @@
 package org.jetbrains.kotlinx.ggdsl.letsplot.translator
 
 import org.jetbrains.kotlinx.ggdsl.ir.Layer
+import org.jetbrains.kotlinx.ggdsl.letsplot.feature.Reversed
 import org.jetbrains.kotlinx.ggdsl.letsplot.internal.GROUP
 import org.jetbrains.kotlinx.ggdsl.letsplot.internal.MERGED_GROUPS
-import org.jetbrains.kotlinx.ggdsl.letsplot.feature.Reversed
 import org.jetbrains.kotlinx.ggdsl.letsplot.position.Position
 import org.jetbrains.kotlinx.ggdsl.letsplot.tooltips.feature.LayerTooltips
 import org.jetbrains.letsPlot.Stat
 import org.jetbrains.letsPlot.intern.Options
 import org.jetbrains.letsPlot.intern.layer.LayerBase
 import org.jetbrains.letsPlot.pos.positionIdentity
+import org.jetbrains.letsPlot.sampling.samplingNone
 
 internal class LayerWrapper internal constructor(private val layer: Layer, addGroups: Boolean) :
     LayerBase(
@@ -28,7 +29,8 @@ internal class LayerWrapper internal constructor(private val layer: Layer, addGr
         tooltips = (layer.features[LayerTooltips.FEATURE_NAME] as? LayerTooltips)?.wrap(),
         position = (layer.features[Position.FEATURE_NAME] as? Position)?.wrap() ?: positionIdentity,
         showLegend = true,
-        orientation = (layer.features[Reversed.FEATURE_NAME] as? Reversed)?.wrap()
+        orientation = (layer.features[Reversed.FEATURE_NAME] as? Reversed)?.wrap(),
+        sampling = samplingNone
     ) {
     // TODO
     override fun seal() = Options(

ggdsl-lets-plot/src/test/kotlin/org/jetbrains/kotlinx/ggdsl/letsplot/translator/LayerWrapperTest.kt

@@ -6,6 +6,7 @@ package org.jetbrains.kotlinx.ggdsl.letsplot.translator
 
 import org.jetbrains.kotlinx.ggdsl.dsl.NamedData
 import org.jetbrains.kotlinx.ggdsl.dsl.column.columnPointer
+import org.jetbrains.kotlinx.ggdsl.dsl.internal.toTyped
 import org.jetbrains.kotlinx.ggdsl.dsl.internal.typed
 import org.jetbrains.kotlinx.ggdsl.dsl.internal.typedList
 import org.jetbrains.kotlinx.ggdsl.dsl.scaled
@@ -14,9 +15,6 @@ import org.jetbrains.kotlinx.ggdsl.ir.bindings.*
 import org.jetbrains.kotlinx.ggdsl.ir.scale.NonPositionalCategoricalScale
 import org.jetbrains.kotlinx.ggdsl.ir.scale.PositionalContinuousUnspecifiedScale
 import org.jetbrains.kotlinx.ggdsl.letsplot.internal.*
-import org.jetbrains.kotlinx.ggdsl.letsplot.internal.COLOR
-import org.jetbrains.kotlinx.ggdsl.letsplot.internal.FILL
-import org.jetbrains.kotlinx.ggdsl.letsplot.internal.WIDTH
 import org.jetbrains.kotlinx.ggdsl.letsplot.layers.BAR
 import org.jetbrains.kotlinx.ggdsl.letsplot.layers.POINT
 import org.jetbrains.kotlinx.ggdsl.letsplot.position.Position
@@ -55,6 +53,7 @@ internal class LayerWrapperTest {
                 "mapping" to mapOf(
                     "fill" to "F"
                 ),
+                "sampling" to "none",
                 "stat" to "identity",
                 "data" to mapOf<String, Any>(),
                 //"shape" to 21.0,
@@ -130,6 +129,7 @@ internal class LayerWrapperTest {
                     "y" to "VAL_V",
                     "fill" to "BAFGA",
                 ),
+                "sampling" to "none",
                 "stat" to "identity",
                 "data" to mapOf<String, Any>(),
                 "width" to 5.0,
@@ -179,6 +179,46 @@ internal class LayerWrapperTest {
 
          */
     }
+
+    @Test
+    fun testBarNoSampling() {
+        val data = mapOf(
+            "v1" to List(100) {it},
+            "v2" to List(100) {it}
+        )
+        val layer = Layer(
+            NamedData(data.toTyped()),
+            BAR,
+            mapOf(
+                X to ScaledUnspecifiedDefaultPositionalMapping(
+                    X, columnPointer<Int>("v1").scaled(), typeOf<Int>()
+                ),
+                Y to ScaledUnspecifiedDefaultPositionalMapping(
+                    Y, columnPointer<Int>("v2").scaled(), typeOf<Int>()
+                )
+            ),
+            mapOf(),
+            mapOf()
+        )
+
+        val wrappedLayer = LayerWrapper(layer, false)
+        assertEquals(
+            mapOf(
+                "mapping" to mapOf(
+                    "x" to "v1",
+                    "y" to "v2",
+                ),
+                "stat" to "identity",
+                "data" to data.map {
+                    it.key to it.value.map { it.toDouble() }
+                }.toMap(),
+                "position" to "identity",
+                "geom" to "bar",
+                "sampling" to "none",
+            ),
+            wrappedLayer.toSpec()
+        )
+    }
 }
 
 

ggdsl-lets-plot/src/test/kotlin/org/jetbrains/kotlinx/ggdsl/letsplot/translator/ToLetsPlotTest.kt

@@ -60,6 +60,7 @@ class ToLetsPlotTest {
                             "x" to "origin",
                             "y" to "mpg"
                         ),
+                        "sampling" to "none",
                         "stat" to "identity",
                    //     "data" to mapOf<String, Any>(),
                         "shape" to 21.0,
@@ -145,6 +146,7 @@ class ToLetsPlotTest {
                             "y" to "svalue",
                             "fill" to "clM"
                         ),
+                        "sampling" to "none",
                         "stat" to "identity",
                   //      "data" to mapOf<String, Any>(),
                         "alpha" to 0.8,
@@ -180,6 +182,7 @@ class ToLetsPlotTest {
                             "x" to "time",
                             "y" to "svalue",
                         ),
+                        "sampling" to "none",
                         "stat" to "identity",
                       //  "data" to mapOf<String, Any>(),
                         "size" to 2.2,

gradle.properties

@@ -1,6 +1,6 @@
 kotlin.code.style=official
 kotlin.jupyter.add.scanner=true
-version = 0.3.0
+version = 0.3.1
 
 # Koltin
 systemProp.kotlin_version=1.8.0