removed extension method, inlined printOn

Author: DurieuxPol

src/Math-FunctionFit/BlockClosure.extension.st

@@ -169,17 +169,12 @@ PMAnotherGeneticOptimizer >> nextGeneration [
 ]
 
 { #category : 'printing' }
-PMAnotherGeneticOptimizer >> printOn1: aStream [
+PMAnotherGeneticOptimizer >> printOn: aStream [
 
 	aStream
 		nextPutAll: self class name;
 		nextPutAll: '( function: ';
-		nextPutAll: originalFunction functionString
-]
-
-{ #category : 'printing' }
-PMAnotherGeneticOptimizer >> printOn2: aStream [
-	aStream
+		nextPutAll: originalFunction compiledBlock asString;
 		nextPutAll: ' manager: ';
 		print: chromosomeManager;
 		nextPutAll: ' maxIterations: ';
@@ -197,12 +192,6 @@ PMAnotherGeneticOptimizer >> printOn2: aStream [
 		nextPut: $)
 ]
 
-{ #category : 'printing' }
-PMAnotherGeneticOptimizer >> printOn: aStream [
-	self printOn1: aStream.
-	self printOn2: aStream
-]
-
 { #category : 'operation' }
 PMAnotherGeneticOptimizer >> processRandomParents: aNumberArray [
 "puts the better chromosome at the first place (is eg necessary for lineCrossOver:and:)"
@@ -251,7 +240,7 @@ result :=nil
 PMAnotherGeneticOptimizer >> setFunction: aBlock [
 	( aBlock respondsTo: #value:)
 		ifFalse:[ self error: 'Function block must implement the method value:'].
-	originalFunction :=aBlock . "necessary for subclass; do not delete that nonsense!"
+	originalFunction := aBlock . "necessary for subclass; do not delete that nonsense!"
 	functionBlock := aBlock.
 	self resetBestPoints
 ]

src/Math-FunctionFit/PMAnotherGeneticOptimizer.class.st

@@ -23,6 +23,13 @@ PMErrorOfParameterFunction class >> function: aBlock data: aCollectionOfPoints [
 ^self new function: aBlock; data: aCollectionOfPoints; yourself
 ]
 
+{ #category : 'accessing' }
+PMErrorOfParameterFunction >> compiledBlock [
+	"This method only exists for polymorphic message send"
+
+	^ self asString
+]
+
 { #category : 'accessing' }
 PMErrorOfParameterFunction >> data [
 ^data
@@ -90,12 +97,6 @@ function :=aBlock .
 varArray :=Array new: aBlock numArgs
 ]
 
-{ #category : 'accessing' }
-PMErrorOfParameterFunction >> functionString [
-
-	^ self asString
-]
-
 { #category : 'initialization' }
 PMErrorOfParameterFunction >> initialize [
 super initialize .

src/Math-FunctionFit/PMErrorOfParameterFunction.class.st

@@ -165,8 +165,9 @@ f :=errorFunction function .
 { #category : 'accessing' }
 PMGeneralFunctionFit >> function: aBlock [
 	"sets the function to be fitted. the first value has to be the independent variable, further values are the parameters to be fitted. only one independent variable is allowed (if you have several independent vars or eg a function of a vector, that returns another vector, have a look at the 'spiral' example)."
-self resetResult.
-errorFunction function: aBlock
+
+	self resetResult.
+	errorFunction function: aBlock
 ]
 
 { #category : 'initialization' }
@@ -181,6 +182,7 @@ PMGeneralFunctionFit >> initialize [
 		                    chromosomeManager: manager;
 		                    maximumIterations: 170;
 		                    yourself.
+
 	self errorType: #squared.
 	verbose := false.
 	dataTruncated := false