Implemented DataSeriesInternal

Author: olekscode

DataFrame-Core.package/Collection.extension/instance/asDataSeries.st

@@ -1,22 +1,6 @@
 *DataFrame-Core
 asDataSeries
+"Converts a collection to Array and constructs a DataSeries from its values"
 
-	| allInstancesOf |
-	
-	allInstancesOf := [ :aClass |
-		self detect: [ :x |
-			(x isKindOf: aClass) not ]
-			ifFound: [ false ]
-			ifNone: [ true ] ].
-
-	(allInstancesOf value: Number) ifTrue: [ 
-		^ DataSeriesNumeric newFrom: self ].
-	
-	(allInstancesOf value: String) ifTrue: [ 
-		"Can we convert it to DataSeriesTime?"
-		[ ^ DataSeriesTime newFrom: self ]
-			on: Error do: [ "nothing" ] ].
-		
-	"Either everything is a String, or none of the above is satisfied. In any case, we convert everything to String"
-	^ DataSeriesText newFrom: self 
+	^ DataSeries fromArray: self asArray.
 

DataFrame-Core.package/DataFrameInternal.class/instance/^equals.st

@@ -11,7 +11,7 @@ comparing
 		(self at: i at: j) = each
 			ifFalse: [ ^ false ] ].
 
-	^ true
+	^ true.
 
 
 

DataFrame-Core.package/DataFrameInternal.class/instance/at.at..st

@@ -1,4 +1,4 @@
 accessing
 at: rowIndex at: columnIndex
 
-	^ matrix at: rowIndex at: columnIndex
+	^ contents at: rowIndex at: columnIndex.

DataFrame-Core.package/DataFrameInternal.class/instance/at.at.put..st

@@ -1,4 +1,4 @@
 accessing
 at: rowIndex at: columnIndex put: value
 
-	^ matrix at: rowIndex at: columnIndex put: value.
+	^ contents at: rowIndex at: columnIndex put: value.

DataFrame-Core.package/DataFrameInternal.class/instance/collect..st

@@ -2,4 +2,4 @@ enumerating
 collect: aBlock
 
 	^ self class fromMatrix:
-		(matrix collect: aBlock).
+		(contents collect: aBlock).

DataFrame-Core.package/DataFrameInternal.class/instance/columnAt..st

@@ -2,4 +2,4 @@ accessing
 columnAt: aNumber
 
 	^ (1 to: self numberOfRows) collect: [ :i |
-		self at: i at: aNumber ]
+		self at: i at: aNumber ].

DataFrame-Core.package/DataFrameInternal.class/instance/columnsAt..st

@@ -1,14 +1,14 @@
 accessing
 columnsAt: anArrayOfNumbers
 
-	| df numberOfRows numberOfColumns |
+	| dfInternal numberOfRows numberOfColumns |
 
 	numberOfRows := self numberOfRows.
 	numberOfColumns := anArrayOfNumbers size.
-	df := DataFrameInternal new: (numberOfRows @ numberOfColumns).
+	dfInternal := DataFrameInternal new: (numberOfRows @ numberOfColumns).
 
 	1 to: numberOfRows do: [ :i |
 		anArrayOfNumbers doWithIndex: [ :j :k |
-			df at: i at: k put: (self at: i at: j) ] ].
+			dfInternal at: i at: k put: (self at: i at: j) ] ].
 
-	^ df
+	^ dfInternal.

DataFrame-Core.package/DataFrameInternal.class/instance/deepCopy.st

@@ -1,4 +1,4 @@
 copying
 deepCopy
 
-	^ DataFrameInternal fromMatrix: matrix
+	^ self class fromMatrix: contents.

DataFrame-Core.package/DataFrameInternal.class/instance/do..st

@@ -1,4 +1,4 @@
 enumerating
 do: aBlock
 
-	^ matrix do: aBlock
+	^ contents do: aBlock.

DataFrame-Core.package/DataFrameInternal.class/instance/initialize..st

@@ -1,10 +1,8 @@
 initialization
 initialize: aPoint
-
-	super initialize.
 
-	matrix := Matrix
+	contents := Matrix
 		rows: aPoint x
 		columns: aPoint y.
 
-	^ self
+	^ self.