Merge pull request #509 from SergeStinckwich/master

Classify methods in Proportion classes

src/Kendrick-Core/KELinearWalkProportionalSelection.class.st

@@ -7,13 +7,13 @@ Class {
 	#category : #'Kendrick-Core-Simulations'
 }
 
-{ #category : #'as yet unclassified' }
+{ #category : #accessing }
 KELinearWalkProportionalSelection >> at: index put: value [
 total := total + value - frequencies at:index.
 frequencies at: index  put: value
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #initialization }
 KELinearWalkProportionalSelection >> initialize: size [
 
 super initialize: size.

src/Kendrick-Core/KEProportionalSelection.class.st

@@ -3,6 +3,11 @@ Abstract class for proportional selection
 
 Based on code from: [https://web.archive.org/web/20210424164451/https://thoughts.johnbnelson.com/fast_proportional_selection/](https://web.archive.org/web/20210424164451/https://thoughts.johnbnelson.com/fast_proportional_selection/)
 
+# Methods 
+`at:` returns the frequencies according to the position in the selection
+`from:` initializes the proportional selection with a new collection of frequencies
+
+`at:put:`, `normalize` and `sample` are abstract methods.
 
 "
 Class {
@@ -36,7 +41,7 @@ aCollection doWithIndex:[:each :i| self at: i put: each]
 
 ]
 
-{ #category : #initialize }
+{ #category : #initialization }
 KEProportionalSelection >> initialize: size [
 	frequencies := Array new: size withAll:0
 ]

src/Kendrick-Core/KETransition.class.st

@@ -29,17 +29,18 @@ KETransition >> = aTransition [
 
 { #category : #accessing }
 KETransition >> executeOn: model times: times [
-	(from at: #status) = #empty
-		ifFalse: [ | old new |
-			old := model population compartments at: from.
-			new := old - times.
-			new := new max: 0.
-			model population compartments at: from put: new ].
-	(to at: #status) = #empty
-		ifFalse: [ | old new |
-			old := model population compartments at: to.
-			new := old + times.
-			model population compartments at: to put: new ]
+
+	| old new |
+	(from at: #status) = #empty ifFalse: [ 
+		| old new |
+		old := model population compartments at: from.
+		new := old - times.
+		new := new max: 0.
+		model population compartments at: from put: new ].
+	(to at: #status) = #empty ifTrue: [ ^ self ].
+	old := model population compartments at: to.
+	new := old + times.
+	model population compartments at: to put: new
 ]
 
 { #category : #accessing }