Closed #87. Fixed the way how a name is chosen for a result of applying a binary operation to two series

Author: olekscode

src/DataFrame-Tests/DataSeriesTest.class.st

@@ -100,7 +100,7 @@ DataSeriesTest >> testArithmeticsAddSeriesToSeriesSameKeysDifferentName [
 	firstSeries := DataSeries withKeys: #(a b c) values: #(1 2 3) name: #X.
 	secondSeries := DataSeries withKeys: #(a b c) values: #(3 4 5) name: #Y.
 
-	expected := DataSeries withKeys: #(a b c) values: #(4 6 8) name: '(no name)'.
+	expected := DataSeries withKeys: #(a b c) values: #(4 6 8) name: #X.
 	actual := firstSeries + secondSeries.
 
 	self assert: actual equals: expected.
@@ -183,7 +183,7 @@ DataSeriesTest >> testArithmeticsDivideSeriesBySeriesSameKeysDifferentName [
 	firstSeries := DataSeries withKeys: #(a b c) values: #(1 2 3) name: #X.
 	secondSeries := DataSeries withKeys: #(a b c) values: #(3 4 5) name: #Y.
 
-	expected := DataSeries withKeys: #(a b c) values: { 1/3 . 1/2 . 3/5 } name: '(no name)'.
+	expected := DataSeries withKeys: #(a b c) values: { 1/3 . 1/2 . 3/5 } name: #X.
 	actual := firstSeries / secondSeries.
 
 	self assert: actual equals: expected.
@@ -277,7 +277,7 @@ DataSeriesTest >> testArithmeticsMultiplySeriesBySeriesSameKeysDifferentName [
 	firstSeries := DataSeries withKeys: #(a b c) values: #(1 2 3) name: #X.
 	secondSeries := DataSeries withKeys: #(a b c) values: #(3 4 5) name: #Y.
 
-	expected := DataSeries withKeys: #(a b c) values: #(3 8 15) name: '(no name)'.
+	expected := DataSeries withKeys: #(a b c) values: #(3 8 15) name: #X.
 	actual := firstSeries * secondSeries.
 
 	self assert: actual equals: expected.
@@ -371,7 +371,7 @@ DataSeriesTest >> testArithmeticsSubtractSeriesFromSeriesSameKeysDifferentName [
 	firstSeries := DataSeries withKeys: #(a b c) values: #(1 2 3) name: #X.
 	secondSeries := DataSeries withKeys: #(a b c) values: #(3 4 5) name: #Y.
 
-	expected := DataSeries withKeys: #(a b c) values: #(-2 -2 -2) name: '(no name)'.
+	expected := DataSeries withKeys: #(a b c) values: #(-2 -2 -2) name: #X.
 	actual := firstSeries - secondSeries.
 
 	self assert: actual equals: expected.

src/DataFrame/DataFrame.class.st

@@ -865,6 +865,14 @@ DataFrame >> initializeRows: anArrayOfArrays [
 	self setDefaultRowColumnNames.
 ]
 
+{ #category : #enumerating }
+DataFrame >> inject: thisValue into: binaryBlock [ 
+	| series |
+	series := super inject: thisValue into: binaryBlock.
+	series name: series defaultName.
+	^ series
+]
+
 { #category : #statistics }
 DataFrame >> interquartileRange [
 

src/DataFrame/DataSeries.class.st

@@ -617,10 +617,7 @@ DataSeries >> withSeries: otherDataSeries collect: twoArgBlock [
 	otherDataSeries keys = self keys ifFalse: [ self errorKeysMismatch ].
 
 	result := self species new: self size.
-	
-	result name: ((otherDataSeries name = self name)
-		ifTrue: [ self name ]
-		ifFalse: [ self defaultName ]).
+	result name: self name.
 
 	self keysDo: [ :key |
 		result at: key put: