Merge pull request #87 from ba-st/gs64-math

gcotelli · web-flow · commit 16a3d09a0607 · 2023-08-09T17:26:37.000-03:00
GS64: Add Math packages
diff --git a/rowan/components/Deployment.ston b/rowan/components/Deployment.ston
@@ -15,6 +15,9 @@ RwSimpleProjectLoadComponentV2 {
     'Buoy-Conditions-Extensions',
     'Buoy-Dynamic-Binding',
     'Buoy-Exception-Handling-Extensions',
+    'Buoy-Math',
+    'Buoy-Math-Extensions',
+    'Buoy-Math-GS64-Base-Extensions',
     'Buoy-Math-GS64-Extensions',
     'Buoy-Metaprogramming',
     'Buoy-Metaprogramming-Extensions',
@@ -42,7 +45,10 @@ RwSimpleProjectLoadComponentV2 {
           'Buoy-Exception-Handling-Extensions' : {
             'symbolDictName' : 'Globals'
            },
-          'Buoy-Math-GS64-Extensions' : {
+          'Buoy-Math-Extensions' : {
+            'symbolDictName' : 'Globals'
+          },
+          'Buoy-Math-GS64-Base-Extensions' : {
             'symbolDictName' : 'Globals'
           },
           'Buoy-Metaprogramming-Extensions' : {
diff --git a/rowan/components/Tests.ston b/rowan/components/Tests.ston
@@ -13,6 +13,7 @@ RwSimpleProjectLoadComponentV2 {
     'Buoy-Conditions-Tests',
     'Buoy-Dynamic-Binding-Tests',
     'Buoy-Exception-Handling-Tests',
+    'Buoy-Math-Tests',
     'Buoy-Metaprogramming-Tests',
     'Buoy-SUnit-Tests'
   ],
diff --git a/rowan/components/scripts/defineExceptionAliases.st b/rowan/components/scripts/defineExceptionAliases.st
@@ -1,10 +1,10 @@
 | symbolDictionary |
 symbolDictionary := Rowan image 
-	symbolDictNamed:'Buoy'
+	symbolDictNamed: 'Buoy'
 	ifAbsent: [
 			Rowan image symbolList createDictionaryNamed: 'Buoy' at: 1.
-			Rowan image symbolDictNamed:'Buoy'
+			Rowan image symbolDictNamed: 'Buoy'
 	].
 symbolDictionary at: #SubscriptOutOfBounds put: OffsetError.
 symbolDictionary at: #NotFound put: LookupError.
-
+symbolDictionary at: #ArithmeticError put: NumericError.
diff --git a/source/BaselineOfBuoy/BaselineOfBuoy.class.st b/source/BaselineOfBuoy/BaselineOfBuoy.class.st
@@ -131,8 +131,20 @@ BaselineOfBuoy >> baselineMath: spec [
 	spec
 		package: 'Buoy-Math' with: [ spec requires: 'Buoy-Assertions' ];
 		group: 'Deployment' with: 'Buoy-Math';
-		package: 'Buoy-Math-Tests' with: [ spec requires: #('Buoy-Math' 'Dependent-SUnit-Extensions') ];
-		group: 'Tests' with: 'Buoy-Math-Tests'
+		package: 'Buoy-Math-Extensions'
+		with: [ spec requires: 'Buoy-Math' ];
+		group: 'Deployment' with: 'Buoy-Math-Extensions';
+		package: 'Buoy-Math-Pharo-Extensions'
+		with: [ spec requires: 'Buoy-Math' ];
+		group: 'Deployment' with: 'Buoy-Math-Pharo-Extensions';
+		package: 'Buoy-Math-Tests' with: [
+			spec requires:
+					#( 'Buoy-Math-Extensions' 'Buoy-Math-Pharo-Extensions'
+					   'Dependent-SUnit-Extensions' ) ];
+		group: 'Tests' with: 'Buoy-Math-Tests';
+		package: 'Buoy-Math-Pharo-Extensions-Tests' with: [
+			spec requires: 'Buoy-Math-Tests' ];
+		group: 'Tests' with: 'Buoy-Math-Pharo-Extensions-Tests'
 ]
 
 { #category : #baselines }
@@ -159,6 +171,8 @@ BaselineOfBuoy >> baselineSUnit: spec [
 	spec
 		package: 'Buoy-SUnit-Model';
 		group: 'Dependent-SUnit-Extensions' with: 'Buoy-SUnit-Model';
+		package: 'Buoy-SUnit-Pharo-Extensions';
+		group: 'Dependent-SUnit-Extensions' with: 'Buoy-SUnit-Pharo-Extensions';
 		package: 'Buoy-SUnit-Tests' with: [ spec requires: 'Dependent-SUnit-Extensions' ];
 		group: 'Tests' with: 'Buoy-SUnit-Tests'
 ]
diff --git a/source/Buoy-GS64-Compatibility/BinaryFloat.class.st b/source/Buoy-GS64-Compatibility/BinaryFloat.class.st
@@ -0,0 +1,11 @@
+"
+BinaryFloat is an abstract class in GS64, the superclass of different implementations of Binary
+floating point.
+This version is just a placeholder so we can easily create extensions methods to load in GS64 specific
+packages.
+"
+Class {
+	#name : #BinaryFloat,
+	#superclass : #Number,
+	#category : #'Buoy-GS64-Compatibility'
+}
diff --git a/source/Buoy-GS64-Compatibility/ClassOrganizer.class.st b/source/Buoy-GS64-Compatibility/ClassOrganizer.class.st
@@ -1,7 +1,9 @@
 "
-In GS64, a `ClassOrganizer` can answer queries about classes in the image, provides
- tools and reports on information on classes and methods and can perform
- cross-referencing and fileout.
+In GS64, a `ClassOrganizer` can answer queries about classes in the image, provides tools and reports
+on information on classes and methods and can perform cross-referencing and fileout.
+
+This version is just a placeholder so we can easily create extension methods referencing this class
+in GS64 specific packages.
 "
 Class {
 	#name : #ClassOrganizer,
diff --git a/source/Buoy-GS64-Compatibility/Collection.extension.st b/source/Buoy-GS64-Compatibility/Collection.extension.st
@@ -0,0 +1,10 @@
+Extension { #name : #Collection }
+
+{ #category : #'*Buoy-GS64-Compatibility' }
+Collection >> any [
+
+	"Answer a representative sample of the receiver. It raises an error when the collection is empty. This method can be helpful when needing to preinfer the nature of the contents of semi-homogeneous collections."
+
+	self emptyCheck.
+	self do: [ :each | ^ each ]
+]
diff --git a/source/Buoy-Math-Extensions/Fraction.extension.st b/source/Buoy-Math-Extensions/Fraction.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #Fraction }
 
-{ #category : #'*Buoy-Math' }
+{ #category : #'*Buoy-Math-Extensions' }
 Fraction >> adaptToFraction: aFraction andSend: selector [
 
 	^self perform: selector with: aFraction 
diff --git a/source/Buoy-Math-Extensions/Integer.extension.st b/source/Buoy-Math-Extensions/Integer.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #Integer }
 
-{ #category : #'*Buoy-Math' }
+{ #category : #'*Buoy-Math-Extensions' }
 Integer >> adaptToInteger: anInteger andSend: selector [
 
 	^ self perform: selector with: anInteger
diff --git a/source/Buoy-Math-Extensions/Number.extension.st b/source/Buoy-Math-Extensions/Number.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #Number }
 
-{ #category : #'*Buoy-Math' }
+{ #category : #'*Buoy-Math-Extensions' }
 Number >> decreasedBy: aPercentage [
 
 	AssertionChecker
@@ -11,7 +11,7 @@ Number >> decreasedBy: aPercentage [
 	^ self * (Percentage oneHundred - aPercentage)
 ]
 
-{ #category : #'*Buoy-Math' }
+{ #category : #'*Buoy-Math-Extensions' }
 Number >> increasedBy: aPercentage [
 
 	AssertionChecker
@@ -22,19 +22,19 @@ Number >> increasedBy: aPercentage [
 	^ self * (Percentage oneHundred + aPercentage)
 ]
 
-{ #category : #'*Buoy-Math' }
+{ #category : #'*Buoy-Math-Extensions' }
 Number >> isPercentage [
 
 	^false
 ]
 
-{ #category : #'*Buoy-Math' }
+{ #category : #'*Buoy-Math-Extensions' }
 Number >> perMille [
 
 	^ PerMille of: self
 ]
 
-{ #category : #'*Buoy-Math' }
+{ #category : #'*Buoy-Math-Extensions' }
 Number >> percent [
 
 	^ Percentage of: self
diff --git a/source/Buoy-Math-Extensions/package.st b/source/Buoy-Math-Extensions/package.st
@@ -0,0 +1 @@
+Package { #name : #'Buoy-Math-Extensions' }
diff --git a/source/Buoy-Math-GS64-Base-Extensions/BinaryFloat.extension.st b/source/Buoy-Math-GS64-Base-Extensions/BinaryFloat.extension.st
@@ -0,0 +1,7 @@
+Extension { #name : #BinaryFloat }
+
+{ #category : #'*Buoy-Math-GS64-Base-Extensions' }
+BinaryFloat >> isInfinite [
+
+	^ self kind = #infinity
+]
diff --git a/source/Buoy-Math-GS64-Base-Extensions/Integer.extension.st b/source/Buoy-Math-GS64-Base-Extensions/Integer.extension.st
@@ -1,13 +1,13 @@
 Extension { #name : #Integer }
 
-{ #category : #'*Buoy-Math-GS64-Extensions' }
+{ #category : #'*Buoy-Math-GS64-Base-Extensions' }
 Integer >> hashMultiply [
 	"No need to do something special in GS64"
 
 	^ self
 ]
 
-{ #category : #'*Buoy-Math-GS64-Extensions' }
+{ #category : #'*Buoy-Math-GS64-Base-Extensions' }
 Integer >> isInteger [
 	"True for all subclasses of Integer."
 
diff --git a/source/Buoy-Math-GS64-Base-Extensions/Number.extension.st b/source/Buoy-Math-GS64-Base-Extensions/Number.extension.st
@@ -0,0 +1,31 @@
+Extension { #name : #Number }
+
+{ #category : #'*Buoy-Math-GS64-Base-Extensions' }
+Number >> asNumber [
+
+	^ self
+]
+
+{ #category : #'*Buoy-Math-GS64-Base-Extensions' }
+Number >> isInteger [
+
+	^ false
+]
+
+{ #category : #'*Buoy-Math-GS64-Base-Extensions' }
+Number >> isZero [
+
+	^ self = 0
+]
+
+{ #category : #'*Buoy-Math-GS64-Base-Extensions' }
+Number >> nthRoot: aPositiveInteger [
+
+	^ self raisedTo: aPositiveInteger reciprocal
+]
+
+{ #category : #'*Buoy-Math-GS64-Base-Extensions' }
+Number >> round: numberOfWishedDecimal [
+
+	^ self roundTo: (10 raisedTo: numberOfWishedDecimal negated)
+]
diff --git a/source/Buoy-Math-GS64-Base-Extensions/package.st b/source/Buoy-Math-GS64-Base-Extensions/package.st
@@ -0,0 +1 @@
+Package { #name : #'Buoy-Math-GS64-Base-Extensions' }
diff --git a/source/Buoy-Math-GS64-Extensions/Number.extension.st b/source/Buoy-Math-GS64-Extensions/Number.extension.st
diff --git a/source/Buoy-Math-GS64-Extensions/PartsPerFraction.extension.st b/source/Buoy-Math-GS64-Extensions/PartsPerFraction.extension.st
@@ -0,0 +1,25 @@
+Extension { #name : #PartsPerFraction }
+
+{ #category : #'*Buoy-Math-GS64-Extensions' }
+PartsPerFraction >> _coerce: aNumber [
+
+	^self class ratio: (ratio _coerce: aNumber)
+]
+
+{ #category : #'*Buoy-Math-GS64-Extensions' }
+PartsPerFraction >> _generality [
+
+	^ ratio _generality + 1
+]
+
+{ #category : #'*Buoy-Math-GS64-Extensions' }
+PartsPerFraction >> printOn: stream [
+
+	self value printOn: stream
+]
+
+{ #category : #'*Buoy-Math-GS64-Extensions' }
+PartsPerFraction >> printString [
+
+	^ String streamContents: [ :stream | self printOn: stream ]
+]
diff --git a/source/Buoy-Math-GS64-Extensions/PerMille.extension.st b/source/Buoy-Math-GS64-Extensions/PerMille.extension.st
@@ -0,0 +1,8 @@
+Extension { #name : #PerMille }
+
+{ #category : #'*Buoy-Math-GS64-Extensions' }
+PerMille >> printOn: stream [
+
+	super printOn: stream.
+	stream nextPutAll: '‰'
+]
diff --git a/source/Buoy-Math-GS64-Extensions/Percentage.extension.st b/source/Buoy-Math-GS64-Extensions/Percentage.extension.st
@@ -0,0 +1,8 @@
+Extension { #name : #Percentage }
+
+{ #category : #'*Buoy-Math-GS64-Extensions' }
+Percentage >> printOn: stream [
+
+	super printOn: stream.
+	stream nextPut: $%
+]
diff --git a/source/Buoy-Math-Pharo-Extensions-Tests/PerMilleTest.extension.st b/source/Buoy-Math-Pharo-Extensions-Tests/PerMilleTest.extension.st
@@ -0,0 +1,10 @@
+Extension { #name : #PerMilleTest }
+
+{ #category : #'*Buoy-Math-Pharo-Extensions-Tests' }
+PerMilleTest >> testStoreOnBase [
+
+	self
+		assert: ( 0 perMille storeStringBase: 16 ) equals: '16r0 perMille';
+		assert: ( 1000 perMille storeStringBase: 16 ) equals: '16r3E8 perMille';
+		assert: ( ( PerMille of: 12 ) storeStringBase: 16 ) equals: '16rC perMille'
+]
diff --git a/source/Buoy-Math-Pharo-Extensions-Tests/PercentageTest.extension.st b/source/Buoy-Math-Pharo-Extensions-Tests/PercentageTest.extension.st
@@ -0,0 +1,10 @@
+Extension { #name : #PercentageTest }
+
+{ #category : #'*Buoy-Math-Pharo-Extensions-Tests' }
+PercentageTest >> testStoreOnBase [
+
+	self
+		assert: ( Percentage zero storeStringBase: 16 ) equals: 'Percentage zero';
+		assert: ( Percentage oneHundred storeStringBase: 16 ) equals: 'Percentage oneHundred';
+		assert: ( ( Percentage of: 12 ) storeStringBase: 16 ) equals: 'Percentage of: 16rC'
+]
diff --git a/source/Buoy-Math-Pharo-Extensions-Tests/package.st b/source/Buoy-Math-Pharo-Extensions-Tests/package.st
@@ -0,0 +1 @@
+Package { #name : #'Buoy-Math-Pharo-Extensions-Tests' }
diff --git a/source/Buoy-Math-Pharo-Extensions/PartsPerFraction.extension.st b/source/Buoy-Math-Pharo-Extensions/PartsPerFraction.extension.st
@@ -0,0 +1,13 @@
+Extension { #name : #PartsPerFraction }
+
+{ #category : #'*Buoy-Math-Pharo-Extensions' }
+PartsPerFraction >> adaptToFraction: aFraction andSend: selector [
+
+	^ aFraction adaptToFraction: ratio andSend: selector
+]
+
+{ #category : #'*Buoy-Math-Pharo-Extensions' }
+PartsPerFraction >> adaptToInteger: anInteger andSend: aSymbol [
+	
+	^anInteger adaptToInteger: ratio  andSend: aSymbol 
+]
diff --git a/source/Buoy-Math-Pharo-Extensions/PerMille.extension.st b/source/Buoy-Math-Pharo-Extensions/PerMille.extension.st
@@ -0,0 +1,17 @@
+Extension { #name : #PerMille }
+
+{ #category : #'*Buoy-Math-Pharo-Extensions' }
+PerMille >> printOn: aStream base: anInteger [
+
+	self value printOn: aStream base: anInteger.
+	aStream nextPut: $‰
+]
+
+{ #category : #'*Buoy-Math-Pharo-Extensions' }
+PerMille >> storeOn: aStream base: base [
+
+	self value storeOn: aStream base: base.
+	aStream
+		space;
+		nextPutAll: 'perMille'
+]
diff --git a/source/Buoy-Math-Pharo-Extensions/Percentage.extension.st b/source/Buoy-Math-Pharo-Extensions/Percentage.extension.st
@@ -0,0 +1,22 @@
+Extension { #name : #Percentage }
+
+{ #category : #'*Buoy-Math-Pharo-Extensions' }
+Percentage >> printOn: aStream base: anInteger [
+
+	self value printOn: aStream base: anInteger.
+	aStream nextPut: $%
+]
+
+{ #category : #'*Buoy-Math-Pharo-Extensions' }
+Percentage >> storeOn: aStream base: base [
+
+	self isWellKnown ifTrue: [ self storeOn: aStream ]
+		ifFalse: [ 
+			aStream
+				nextPutAll: self class name asString;
+				space;
+				nextPutAll: 'of:';
+				space.
+			self value storeOn: aStream base: base
+			]
+]
diff --git a/source/Buoy-Math-Pharo-Extensions/package.st b/source/Buoy-Math-Pharo-Extensions/package.st
@@ -0,0 +1 @@
+Package { #name : #'Buoy-Math-Pharo-Extensions' }
diff --git a/source/Buoy-Math-Tests/BuoyNumberExtensionsTest.class.st b/source/Buoy-Math-Tests/BuoyNumberExtensionsTest.class.st
@@ -4,7 +4,7 @@ I'm a Test Case for the extensions defined in this package to Number.
 Class {
 	#name : #BuoyNumberExtensionsTest,
 	#superclass : #TestCase,
-	#category : 'Buoy-Math-Tests'
+	#category : #'Buoy-Math-Tests'
 }
 
 { #category : #tests }
diff --git a/source/Buoy-Math-Tests/PerMilleTest.class.st b/source/Buoy-Math-Tests/PerMilleTest.class.st
diff --git a/source/Buoy-Math-Tests/PercentageTest.class.st b/source/Buoy-Math-Tests/PercentageTest.class.st
diff --git a/source/Buoy-Math/PartsPerFraction.class.st b/source/Buoy-Math/PartsPerFraction.class.st
diff --git a/source/Buoy-Math/PerMille.class.st b/source/Buoy-Math/PerMille.class.st
diff --git a/source/Buoy-Math/Percentage.class.st b/source/Buoy-Math/Percentage.class.st
diff --git a/source/Buoy-SUnit-GS64-Extensions/TestCase.extension.st b/source/Buoy-SUnit-GS64-Extensions/TestCase.extension.st
diff --git a/source/Buoy-SUnit-Pharo-Extensions/TestCase.extension.st b/source/Buoy-SUnit-Pharo-Extensions/TestCase.extension.st
diff --git a/source/Buoy-SUnit-Pharo-Extensions/package.st b/source/Buoy-SUnit-Pharo-Extensions/package.st

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,9 @@`
`1`	`1`	`"`
`2`		-In GS64, a `ClassOrganizer` can answer queries about classes in the image, provides
`3`		`- tools and reports on information on classes and methods and can perform`
`4`		`- cross-referencing and fileout.`
	`2`	+In GS64, a `ClassOrganizer` can answer queries about classes in the image, provides tools and reports
	`3`	`+on information on classes and methods and can perform cross-referencing and fileout.`
	`4`	`+`
	`5`	`+This version is just a placeholder so we can easily create extension methods referencing this class`
	`6`	`+in GS64 specific packages.`
`5`	`7`	`"`
`6`	`8`	`Class {`
`7`	`9`	`#name : #ClassOrganizer,`