Skip to content

Fixed remaining red tests #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jordanmontt merged 5 commits into from
Mar 27, 2026
Merged

Fixed remaining red tests #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
820655f
fixed printOn: methods
DurieuxPol Mar 25, 2026
8cbae10
changed random seed so that tests passes in all Pharo versions
DurieuxPol Mar 25, 2026
07885b0
moved method to superclass for backward compatibility
DurieuxPol Mar 25, 2026
18d3bf8
removed extension method, inlined printOn
DurieuxPol Mar 26, 2026
e666a48
fixed print tests
DurieuxPol Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Math-FunctionFit/Collection.extension.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Extension { #name : #Collection }
Extension { #name : 'Collection' }

{ #category : #'*Math-FunctionFit' }
{ #category : '*Math-FunctionFit' }
Collection >> norm [
^(self*self)sum sqrt
]
55 changes: 28 additions & 27 deletions src/Math-FunctionFit/PMAnotherChromosomeManager.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ AnotherChromosomeManager implements more specific operations for Floats.
Is used by AnotherGeneticOptimizer
"
Class {
#name : #PMAnotherChromosomeManager,
#superclass : #PMVectorChromosomeManager,
#name : 'PMAnotherChromosomeManager',
#superclass : 'PMVectorChromosomeManager',
#instVars : [
'hammersley',
'rateOfLC',
Expand All @@ -14,10 +14,11 @@ Class {
#classVars : [
'Primes'
],
#category : #'Math-FunctionFit'
#category : 'Math-FunctionFit',
#package : 'Math-FunctionFit'
}

{ #category : #utilities }
{ #category : 'utilities' }
PMAnotherChromosomeManager class >> integerDigitsFor: anInteger base: aBase [
| n integer next result |
"n:=(anInteger ln / aBase ln) floor ." "does not always work because of floating point errors. next 2 lines are better"
Expand All @@ -33,7 +34,7 @@ PMAnotherChromosomeManager class >> integerDigitsFor: anInteger base: aBase [
^result
]

{ #category : #utilities }
{ #category : 'utilities' }
PMAnotherChromosomeManager class >> numberOfHamersleyPoints: n dimension: d randomGenerator: randomGenerator [
"a bit randomized "

Expand All @@ -59,12 +60,12 @@ PMAnotherChromosomeManager class >> numberOfHamersleyPoints: n dimension: d rand
ifNil: [ sum ] ] ] ]
]

{ #category : #'instance creation' }
{ #category : 'instance creation' }
PMAnotherChromosomeManager class >> origin: anArray range: anotherArray [
^self new origin: anArray; range: anotherArray; yourself
]

{ #category : #operation }
{ #category : 'operation' }
PMAnotherChromosomeManager >> crossover: aChromosome1 and: aChromosome2 [
"the Discrete Recombination operator
that does not prefer schemata of certain parameters based on their position"
Expand All @@ -86,7 +87,7 @@ that does not prefer schemata of certain parameters based on their position"
^ Array with: new1 with: new2
]

{ #category : #operation }
{ #category : 'operation' }
PMAnotherChromosomeManager >> eirCrossover: aChromosome1 and: aChromosome2 [
"the Extended Intermediate Recombination 0.5 operator, slightly changed to make it more similar to linecrossover (distribution is more centered around Chromosome1, which is better than C2)"
| randomNumbers new1 new2 dif |
Expand All @@ -108,7 +109,7 @@ PMAnotherChromosomeManager >> eirCrossover: aChromosome1 and: aChromosome2 [
^ { new1 . new2 }
]

{ #category : #initialization }
{ #category : 'initialization' }
PMAnotherChromosomeManager >> initialize [

super initialize.
Expand All @@ -121,13 +122,13 @@ PMAnotherChromosomeManager >> initialize [
Primes ifNil: [ Primes := Integer primesUpTo: 500 ] "sufficient for up to 95 dimensions (parameters)"
]

{ #category : #information }
{ #category : 'information' }
PMAnotherChromosomeManager >> isFullyPopulated [
population ifNil: [^false].
^super isFullyPopulated
]

{ #category : #operation }
{ #category : 'operation' }
PMAnotherChromosomeManager >> lineCrossOver: aChromosome1 and: aChromosome2 [
"BGA Line Recombination; expects C1 to be better than C2, which is not correct at the moment, need to change that!!! mhm i think i did that."
| new1 new2 line norm|
Expand All @@ -140,7 +141,7 @@ PMAnotherChromosomeManager >> lineCrossOver: aChromosome1 and: aChromosome2 [
^Array with: new1 with: new2
]

{ #category : #operation }
{ #category : 'operation' }
PMAnotherChromosomeManager >> mutate: aVector [
"BGA mutation"
| isMutated threshold new index |
Expand All @@ -163,13 +164,13 @@ PMAnotherChromosomeManager >> mutate: aVector [
^ new
]

{ #category : #accessing }
{ #category : 'accessing' }
PMAnotherChromosomeManager >> populationSize [
"AnotherGeneticOptimizer needs these data"
^populationSize
]

{ #category : #printing }
{ #category : 'printing' }
PMAnotherChromosomeManager >> printOn: aStream [
aStream
nextPutAll: self class name;
Expand All @@ -184,7 +185,7 @@ PMAnotherChromosomeManager >> printOn: aStream [
nextPut: $)
]

{ #category : #operation }
{ #category : 'operation' }
PMAnotherChromosomeManager >> process: aChromosome1 and: aChromosome2 [
| roll |
roll := randomNumberGenerator next.
Expand All @@ -208,78 +209,78 @@ PMAnotherChromosomeManager >> process: aChromosome1 and: aChromosome2 [
add: (self clone: aChromosome2)]]]]
]

{ #category : #accessing }
{ #category : 'accessing' }
PMAnotherChromosomeManager >> randomGenerator [

^ randomGenerator
]

{ #category : #accessing }
{ #category : 'accessing' }
PMAnotherChromosomeManager >> randomGenerator: anObject [

randomGenerator := anObject
]

{ #category : #private }
{ #category : 'private' }
PMAnotherChromosomeManager >> randomRangeAt: aPosition [
^(range at: aPosition )*(self smallDistribution )
]

{ #category : #operation }
{ #category : 'operation' }
PMAnotherChromosomeManager >> randomizePopulation [

hammersley ifFalse: [ ^ super randomizePopulation ].
population := self class numberOfHamersleyPoints: populationSize dimension: origin size randomGenerator: (self randomGenerator ifNil: [ Random new ]).
population := population collect: [ :aChr | aChr * range + origin ]
]

{ #category : #accessing }
{ #category : 'accessing' }
PMAnotherChromosomeManager >> range [
"AnotherGeneticOptimizer needs these data"
^range
]

{ #category : #initialization }
{ #category : 'initialization' }
PMAnotherChromosomeManager >> rateOfCrossover: aNumber [

self testRate: aNumber oldRate: rateOfCrossover name: 'rateOfCrossover'.
rateOfCrossover := aNumber
]

{ #category : #initialization }
{ #category : 'initialization' }
PMAnotherChromosomeManager >> rateOfEir: aNumber [

self testRate: aNumber oldRate: rateOfEir name: 'rateOfEir'.
rateOfEir := aNumber
]

{ #category : #initialization }
{ #category : 'initialization' }
PMAnotherChromosomeManager >> rateOfLC: aNumber [

self testRate: aNumber oldRate: rateOfLC name: 'rateOfLC'.
rateOfLC := aNumber
]

{ #category : #initialization }
{ #category : 'initialization' }
PMAnotherChromosomeManager >> rateOfMutation: aNumber [
self testRate: aNumber oldRate: rateOfMutation name: 'rateOfMutation'.
rateOfMutation := aNumber
]

{ #category : #private }
{ #category : 'private' }
PMAnotherChromosomeManager >> smallDistribution [
"an exponential distribution as used by H. Mühlenbein"
^ 2 raisedTo: (16 * randomNumberGenerator next negated)
]

{ #category : #private }
{ #category : 'private' }
PMAnotherChromosomeManager >> testRate:aFloat oldRate: asecondFloat name:aString [
(aFloat between: 0 and: 1) ifFalse: [(DomainError new)from:0;to:1;messageText: 'Value outside [0 , 1]';signalIn: thisContext sender].
(rateOfCrossover + rateOfMutation + rateOfLC + rateOfEir + aFloat - asecondFloat)>1.000000000000001 "for Float inaccuracies"
ifTrue: [Warning signal:'All rates together are higher than 1, if ' , aString, ' is set to ',aFloat asString ]
]

{ #category : #initialization }
{ #category : 'initialization' }
PMAnotherChromosomeManager >> useHammersley: aBoolean [
"default is true"
hammersley :=aBoolean
Expand Down
Loading
Loading