DataSet more generic

Author: hannesa2

chartLib/src/main/kotlin/info/appdev/charting/data/BarLineScatterCandleBubbleDataSet.kt

@@ -7,7 +7,7 @@ import info.appdev.charting.interfaces.datasets.IBarLineScatterCandleBubbleDataS
 /**
  * Baseclass of all DataSets for Bar-, Line-, Scatter- and CandleStickChart.
  */
-abstract class BarLineScatterCandleBubbleDataSet<T : EntryFloat>(yVals: MutableList<T>, label: String) :
+abstract class BarLineScatterCandleBubbleDataSet<T : BaseEntry<Float>>(yVals: MutableList<T>, label: String) :
     DataSet<T>(yVals, label), IBarLineScatterCandleBubbleDataSet<T> {
     /**
      * Sets the color that is used for drawing the highlight indicators.

chartLib/src/main/kotlin/info/appdev/charting/data/BaseDataSet.kt

@@ -19,7 +19,7 @@ import info.appdev.charting.utils.convertDpToPixel
  * This is the base dataset of all DataSets. Its purpose is to implement critical methods
  * provided by the IDataSet interface.
  */
-abstract class BaseDataSet<T : EntryFloat>() : IDataSet<T> {
+abstract class BaseDataSet<T : BaseEntry<Float>>() : IDataSet<T> {
     /**
      * List representing all colors that are used for this DataSet
      */

chartLib/src/main/kotlin/info/appdev/charting/data/DataSet.kt

@@ -10,7 +10,7 @@ import kotlin.math.abs
  * groups of values inside the Chart (e.g. the values for a specific line in the
  * LineChart, or the values of a specific group of bars in the BarChart).
  */
-abstract class DataSet<T : EntryFloat>(
+abstract class DataSet<T : BaseEntry<Float>>(
     protected var entriesInternal: MutableList<T>,
     label: String = ""
 ) : BaseDataSet<T>(label), Serializable {
@@ -219,72 +219,55 @@ abstract class DataSet<T : EntryFloat>(
         while (low < high) {
             val m = low + (high - low) / 2
 
-            val currentEntryFloat: EntryFloat = entriesInternal[m]
+            val current = entriesInternal[m]
+            val next = entriesInternal[m + 1]
 
-            val nextEntryFloat: EntryFloat = entriesInternal[m + 1]
-
-            val d1 = currentEntryFloat.x - xValue
-            val d2 = nextEntryFloat.x - xValue
+            val d1 = current.x - xValue
+            val d2 = next.x - xValue
             val ad1 = abs(d1)
             val ad2 = abs(d2)
 
             if (ad2 < ad1) {
-                // [m + 1] is closer to xValue
-                // Search in a higher place
                 low = m + 1
             } else if (ad1 < ad2) {
-                // [m] is closer to xValue
-                // Search in a lower place
                 high = m
             } else {
-                // We have multiple sequential x-value with same distance
-
                 if (d1 >= 0.0) {
-                    // Search in a lower place
                     high = m
                 } else if (d1 < 0.0) {
-                    // Search in a higher place
                     low = m + 1
                 }
             }
 
             closest = high
         }
 
-        val closestEntryFloat: EntryFloat = entriesInternal[closest]
-        val closestXValue = closestEntryFloat.x
+        val closestEntry = entriesInternal[closest]
+        val closestXValue = closestEntry.x
         if (rounding == Rounding.UP) {
-            // If rounding up, and found x-value is lower than specified x, and we can go upper...
             if (closestXValue < xValue && closest < entriesInternal.size - 1) {
                 ++closest
             }
         } else if (rounding == Rounding.DOWN) {
-            // If rounding down, and found x-value is upper than specified x, and we can go lower...
             if (closestXValue > xValue && closest > 0) {
                 --closest
             }
         }
 
-        // Search by closest to y-value
         if (!closestToY.isNaN()) {
             while (closest > 0 && entriesInternal[closest - 1].x == closestXValue) {
                 closest -= 1
             }
 
-            var closestYValue = closestEntryFloat.y
+            var closestYValue = closestEntry.y
             var closestYIndex = closest
 
             while (true) {
                 closest += 1
-                if (closest >= entriesInternal.size) {
-                    break
-                }
+                if (closest >= entriesInternal.size) break
 
                 val value: T = entriesInternal[closest]
-
-                if (value.x != closestXValue) {
-                    break
-                }
+                if (value.x != closestXValue) break
 
                 if (abs(value.y - closestToY) <= abs(closestYValue - closestToY)) {
                     closestYValue = closestToY

chartLib/src/main/kotlin/info/appdev/charting/data/LineRadarDataSet.kt

@@ -9,7 +9,7 @@ import info.appdev.charting.utils.convertDpToPixel
 /**
  * Base dataset for line and radar DataSets.
  */
-abstract class LineRadarDataSet<T : EntryFloat>(yVals: MutableList<T>, label: String) : LineScatterCandleRadarDataSet<T>(yVals, label), ILineRadarDataSet<T> {
+abstract class LineRadarDataSet<T : BaseEntry<Float>>(yVals: MutableList<T>, label: String) : LineScatterCandleRadarDataSet<T>(yVals, label), ILineRadarDataSet<T> {
     // TODO: Move to using `Fill` class
     /**
      * the color that is used for filling the line surface

chartLib/src/main/kotlin/info/appdev/charting/data/LineScatterCandleRadarDataSet.kt

@@ -4,7 +4,7 @@ import android.graphics.DashPathEffect
 import info.appdev.charting.interfaces.datasets.ILineScatterCandleRadarDataSet
 import info.appdev.charting.utils.convertDpToPixel
 
-abstract class LineScatterCandleRadarDataSet<T : EntryFloat>(yVals: MutableList<T>, label: String) : BarLineScatterCandleBubbleDataSet<T>(yVals, label),
+abstract class LineScatterCandleRadarDataSet<T : BaseEntry<Float>>(yVals: MutableList<T>, label: String) : BarLineScatterCandleBubbleDataSet<T>(yVals, label),
     ILineScatterCandleRadarDataSet<T> {
     override var isVerticalHighlightIndicator: Boolean = true
     override var isHorizontalHighlightIndicator: Boolean = true