Merge pull request #197 from jecisc/rearchitect-packages

jecisc · web-flow · commit b7681f1956d8 · 2023-03-15T23:20:24.000+01:00
Merge Math in Core and Type in IO
diff --git a/src/BaselineOfDataFrame/BaselineOfDataFrame.class.st b/src/BaselineOfDataFrame/BaselineOfDataFrame.class.st
@@ -23,12 +23,8 @@ BaselineOfDataFrame >> baseline: spec [
 		spec
 			package: 'DataFrame' with: [ spec requires: #('AINormalization') ];
 			package: 'DataFrame-Tests' with: [ spec requires: #('DataFrame') ];
-			package: 'DataFrame-Type' with: [ spec requires: #('DataFrame') ];
-			package: 'DataFrame-Type-Tests' with: [ spec requires: #('DataFrame-Type') ];
-			package: 'DataFrame-IO' with: [ spec requires: #('DataFrame' 'DataFrame-Type' 'NeoCSV' 'NeoJSON') ];
-			package: 'DataFrame-IO-Tests' with: [ spec requires: #('DataFrame-IO') ];
-			package: 'DataFrame-Math';
-			package: 'DataFrame-Math-Tests' with: [ spec requires: #('DataFrame-Math') ] ].
+			package: 'DataFrame-IO' with: [ spec requires: #('DataFrame' 'NeoCSV' 'NeoJSON') ];
+			package: 'DataFrame-IO-Tests' with: [ spec requires: #('DataFrame-IO') ] ].
 
 		spec
 			for: #'pharo7.x'
diff --git a/src/DataFrame-IO-Tests/DataFrameCsvReaderTest.class.st b/src/DataFrame-IO-Tests/DataFrameCsvReaderTest.class.st
@@ -10,7 +10,7 @@ Class {
 		'dataFrameWithoutRowNames',
 		'dataFrameWithRowNames'
 	],
-	#category : #'DataFrame-IO-Tests'
+	#category : #'DataFrame-IO-Tests-Core'
 }
 
 { #category : #running }
diff --git a/src/DataFrame-IO-Tests/DataFrameCsvWriterTest.class.st b/src/DataFrame-IO-Tests/DataFrameCsvWriterTest.class.st
@@ -7,7 +7,7 @@ Class {
 		'commaQuoteCsvFile',
 		'tabQuoteCsvFile'
 	],
-	#category : #'DataFrame-IO-Tests'
+	#category : #'DataFrame-IO-Tests-Core'
 }
 
 { #category : #running }
diff --git a/src/DataFrame-IO-Tests/DataFrameJsonReaderTest.class.st b/src/DataFrame-IO-Tests/DataFrameJsonReaderTest.class.st
@@ -8,7 +8,7 @@ Class {
 		'dfWithRowNames',
 		'dfWithRowColNames'
 	],
-	#category : #'DataFrame-IO-Tests'
+	#category : #'DataFrame-IO-Tests-Core'
 }
 
 { #category : #running }
diff --git a/src/DataFrame-IO-Tests/DataFrameJsonWriterTest.class.st b/src/DataFrame-IO-Tests/DataFrameJsonWriterTest.class.st
@@ -5,7 +5,7 @@ Class {
 		'directory',
 		'df'
 	],
-	#category : #'DataFrame-IO-Tests'
+	#category : #'DataFrame-IO-Tests-Core'
 }
 
 { #category : #running }
diff --git a/src/DataFrame-IO-Tests/DataFrameTypeDetectorTest.class.st b/src/DataFrame-IO-Tests/DataFrameTypeDetectorTest.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'detector'
 	],
-	#category : #'DataFrame-Type-Tests'
+	#category : #'DataFrame-IO-Tests-Type'
 }
 
 { #category : #running }
diff --git a/src/DataFrame-IO-Tests/TestCsvStrings.class.st b/src/DataFrame-IO-Tests/TestCsvStrings.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #TestCsvStrings,
 	#superclass : #Object,
-	#category : #'DataFrame-IO-Tests'
+	#category : #'DataFrame-IO-Tests-Core'
 }
 
 { #category : #running }
diff --git a/src/DataFrame-IO-Tests/TestJsonStrings.class.st b/src/DataFrame-IO-Tests/TestJsonStrings.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #TestJsonStrings,
 	#superclass : #Object,
-	#category : #'DataFrame-IO-Tests'
+	#category : #'DataFrame-IO-Tests-Core'
 }
 
 { #category : #running }
diff --git a/src/DataFrame-IO/DataFrameCsvReader.class.st b/src/DataFrame-IO/DataFrameCsvReader.class.st
@@ -39,7 +39,7 @@ Class {
 		'rows',
 		'columnNames'
 	],
-	#category : #'DataFrame-IO'
+	#category : #'DataFrame-IO-Core'
 }
 
 { #category : #reading }
diff --git a/src/DataFrame-IO/DataFrameCsvWriter.class.st b/src/DataFrame-IO/DataFrameCsvWriter.class.st
@@ -5,7 +5,7 @@ Class {
 		'separator',
 		'lineEndConvention'
 	],
-	#category : #'DataFrame-IO'
+	#category : #'DataFrame-IO-Core'
 }
 
 { #category : #accessing }
diff --git a/src/DataFrame-IO/DataFrameJsonReader.class.st b/src/DataFrame-IO/DataFrameJsonReader.class.st
@@ -9,7 +9,7 @@ Class {
 		'uniform',
 		'parseMap'
 	],
-	#category : #'DataFrame-IO'
+	#category : #'DataFrame-IO-Core'
 }
 
 { #category : #adding }
diff --git a/src/DataFrame-IO/DataFrameJsonWriter.class.st b/src/DataFrame-IO/DataFrameJsonWriter.class.st
@@ -6,7 +6,7 @@ Class {
 		'pretty',
 		'writeMap'
 	],
-	#category : #'DataFrame-IO'
+	#category : #'DataFrame-IO-Core'
 }
 
 { #category : #converting }
diff --git a/src/DataFrame-IO/DataFrameReader.class.st b/src/DataFrame-IO/DataFrameReader.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'columnTypes'
 	],
-	#category : #'DataFrame-IO'
+	#category : #'DataFrame-IO-Core'
 }
 
 { #category : #accessing }
diff --git a/src/DataFrame-IO/DataFrameTextWriter.class.st b/src/DataFrame-IO/DataFrameTextWriter.class.st
@@ -22,7 +22,7 @@ Class {
 	#instVars : [
 		'padDirection'
 	],
-	#category : #'DataFrame-IO'
+	#category : #'DataFrame-IO-Core'
 }
 
 { #category : #accessing }
diff --git a/src/DataFrame-IO/DataFrameTypeDetector.class.st b/src/DataFrame-IO/DataFrameTypeDetector.class.st
@@ -44,7 +44,7 @@ Class {
 		'columnTypes',
 		'typeMapping'
 	],
-	#category : #'DataFrame-Type'
+	#category : #'DataFrame-IO-Type'
 }
 
 { #category : #testing }
diff --git a/src/DataFrame-IO/DataFrameWriter.class.st b/src/DataFrame-IO/DataFrameWriter.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #DataFrameWriter,
 	#superclass : #Object,
-	#category : #'DataFrame-IO'
+	#category : #'DataFrame-IO-Core'
 }
 
 { #category : #writing }
diff --git a/src/DataFrame-Math-Tests/package.st b/src/DataFrame-Math-Tests/package.st
diff --git a/src/DataFrame-Math/package.st b/src/DataFrame-Math/package.st
diff --git a/src/DataFrame-Tests/DataFrameAggrGroupTest.class.st b/src/DataFrame-Tests/DataFrameAggrGroupTest.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'df'
 	],
-	#category : #'DataFrame-Tests'
+	#category : #'DataFrame-Tests-Core'
 }
 
 { #category : #running }
diff --git a/src/DataFrame-Tests/DataFrameHeadTailTest.class.st b/src/DataFrame-Tests/DataFrameHeadTailTest.class.st
@@ -5,7 +5,7 @@ Class {
 		'df',
 		'series'
 	],
-	#category : #'DataFrame-Tests'
+	#category : #'DataFrame-Tests-Core'
 }
 
 { #category : #running }
diff --git a/src/DataFrame-Tests/DataFrameInternalTest.class.st b/src/DataFrame-Tests/DataFrameInternalTest.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'df'
 	],
-	#category : #'DataFrame-Tests'
+	#category : #'DataFrame-Tests-Core'
 }
 
 { #category : #running }
diff --git a/src/DataFrame-Tests/DataFrameStatsTest.class.st b/src/DataFrame-Tests/DataFrameStatsTest.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'df'
 	],
-	#category : #'DataFrame-Tests'
+	#category : #'DataFrame-Tests-Core'
 }
 
 { #category : #running }
diff --git a/src/DataFrame-Tests/DataFrameTest.class.st b/src/DataFrame-Tests/DataFrameTest.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'df'
 	],
-	#category : #'DataFrame-Tests'
+	#category : #'DataFrame-Tests-Core'
 }
 
 { #category : #running }
diff --git a/src/DataFrame-Tests/DataPearsonCorrelationMethodTest.class.st b/src/DataFrame-Tests/DataPearsonCorrelationMethodTest.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #DataPearsonCorrelationMethodTest,
 	#superclass : #TestCase,
-	#category : #'DataFrame-Math-Tests'
+	#category : #'DataFrame-Tests-Math'
 }
 
 { #category : #tests }
diff --git a/src/DataFrame-Tests/DataSeriesTest.class.st b/src/DataFrame-Tests/DataSeriesTest.class.st
@@ -5,7 +5,7 @@ Class {
 		'series',
 		'keyArray'
 	],
-	#category : #'DataFrame-Tests'
+	#category : #'DataFrame-Tests-Core'
 }
 
 { #category : #running }
diff --git a/src/DataFrame-Type-Tests/package.st b/src/DataFrame-Type-Tests/package.st
diff --git a/src/DataFrame-Type/package.st b/src/DataFrame-Type/package.st
diff --git a/src/DataFrame/DataCorrelationMethod.class.st b/src/DataFrame/DataCorrelationMethod.class.st
diff --git a/src/DataFrame/DataPearsonCorrelationMethod.class.st b/src/DataFrame/DataPearsonCorrelationMethod.class.st

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ Class {`
`10`	`10`	`'dataFrameWithoutRowNames',`
`11`	`11`	`'dataFrameWithRowNames'`
`12`	`12`	`],`
`13`		`- #category : #'DataFrame-IO-Tests'`
	`13`	`+ #category : #'DataFrame-IO-Tests-Core'`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`{ #category : #running }`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ Class {`
`7`	`7`	`'commaQuoteCsvFile',`
`8`	`8`	`'tabQuoteCsvFile'`
`9`	`9`	`],`
`10`		`- #category : #'DataFrame-IO-Tests'`
	`10`	`+ #category : #'DataFrame-IO-Tests-Core'`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`{ #category : #running }`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ Class {`
`8`	`8`	`'dfWithRowNames',`
`9`	`9`	`'dfWithRowColNames'`
`10`	`10`	`],`
`11`		`- #category : #'DataFrame-IO-Tests'`
	`11`	`+ #category : #'DataFrame-IO-Tests-Core'`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`{ #category : #running }`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ Class {`
`5`	`5`	`'directory',`
`6`	`6`	`'df'`
`7`	`7`	`],`
`8`		`- #category : #'DataFrame-IO-Tests'`
	`8`	`+ #category : #'DataFrame-IO-Tests-Core'`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`{ #category : #running }`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ Class {`
`4`	`4`	`#instVars : [`
`5`	`5`	`'detector'`
`6`	`6`	`],`
`7`		`- #category : #'DataFrame-Type-Tests'`
	`7`	`+ #category : #'DataFrame-IO-Tests-Type'`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`{ #category : #running }`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`Class {`
`2`	`2`	`#name : #TestCsvStrings,`
`3`	`3`	`#superclass : #Object,`
`4`		`- #category : #'DataFrame-IO-Tests'`
	`4`	`+ #category : #'DataFrame-IO-Tests-Core'`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`{ #category : #running }`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`Class {`
`2`	`2`	`#name : #TestJsonStrings,`
`3`	`3`	`#superclass : #Object,`
`4`		`- #category : #'DataFrame-IO-Tests'`
	`4`	`+ #category : #'DataFrame-IO-Tests-Core'`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`{ #category : #running }`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ Class {`
`39`	`39`	`'rows',`
`40`	`40`	`'columnNames'`
`41`	`41`	`],`
`42`		`- #category : #'DataFrame-IO'`
	`42`	`+ #category : #'DataFrame-IO-Core'`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`{ #category : #reading }`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ Class {`
`5`	`5`	`'separator',`
`6`	`6`	`'lineEndConvention'`
`7`	`7`	`],`
`8`		`- #category : #'DataFrame-IO'`
	`8`	`+ #category : #'DataFrame-IO-Core'`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`{ #category : #accessing }`