Skip to content

Commit

Permalink
Renamed some classes
Browse files Browse the repository at this point in the history
  • Loading branch information
olekscode committed Jun 26, 2023
1 parent 04217c9 commit f21ab3f
Show file tree
Hide file tree
Showing 10 changed files with 49 additions and 49 deletions.
10 changes: 0 additions & 10 deletions src/ReHab-Model/ReHabBlind.class.st

This file was deleted.

10 changes: 10 additions & 0 deletions src/ReHab-Model/ReHabBlindStrategy.class.st
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Class {
#name : #ReHabBlindStrategy,
#superclass : #ReHabFamilyStrategy,
#category : #'ReHab-Model'
}

{ #category : #accessing }
ReHabBlindStrategy >> possibleLocations [
^ super possibleLocations
]
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
Class {
#name : #ReHabCrusader,
#superclass : #ReHabStrategyParkManager,
#name : #ReHabCrusaderStrategy,
#superclass : #ReHabParkManagerStrategy,
#category : #'ReHab-Model'
}

{ #category : #accessing }
ReHabCrusader class >> entityName [
ReHabCrusaderStrategy class >> entityName [

^ 'Crusader'
]

{ #category : #testing }
ReHabCrusader class >> isAbstract [
ReHabCrusaderStrategy class >> isAbstract [
^false
]

{ #category : #control }
ReHabCrusader >> getLocations [
ReHabCrusaderStrategy >> getLocations [
| selection coll |

selection := OrderedCollection new.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Class {
#name : #ReHabExplorer,
#superclass : #ReHabStrategyFamily,
#name : #ReHabExplorerStrategy,
#superclass : #ReHabFamilyStrategy,
#category : #'ReHab-Model'
}

{ #category : #accessing }
ReHabExplorer >> possibleLocations [
ReHabExplorerStrategy >> possibleLocations [
^ super possibleLocations select: [ :z | z biomass isZero not ]
]
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Class {
#name : #ReHabStrategyFamily,
#name : #ReHabFamilyStrategy,
#superclass : #ReHabStrategy,
#instVars : [
'restrained',
Expand All @@ -9,7 +9,7 @@ Class {
}

{ #category : #control }
ReHabStrategyFamily >> getLocations [
ReHabFamilyStrategy >> getLocations [
| coll nbOut selection |
coll := OrderedCollection new.
nbOut := (self holder size * self restrained) rounded.
Expand All @@ -25,38 +25,38 @@ ReHabStrategyFamily >> getLocations [
]

{ #category : #accessing }
ReHabStrategyFamily >> poacher [
ReHabFamilyStrategy >> poacher [
"Getter accessor with initial value = 0.
This method was automatically generated by Cormas.
!! BECAREFUL, You should not modify this method as it can be generated again when changing the value (Sensitivity Analysis for ex) !! "
^poacher ifNil:[poacher := 0]
]

{ #category : #accessing }
ReHabStrategyFamily >> poacher: aSmallInteger [
ReHabFamilyStrategy >> poacher: aSmallInteger [
"Setter accessor of attribute poacher This method was automatically generated by Cormas.
!! BECAREFUL, You should not modify this method as it can be generated again when changing the value (Sensitivity Analysis for ex) !! "
poacher := aSmallInteger
]

{ #category : #accessing }
ReHabStrategyFamily >> possibleLocations [
ReHabFamilyStrategy >> possibleLocations [

^self poacher isZero
ifTrue: [self holder zones select: [:z | z access]]
ifFalse: [self holder zones]
]

{ #category : #accessing }
ReHabStrategyFamily >> restrained [
ReHabFamilyStrategy >> restrained [
"Getter accessor with initial value = 0.
This method was automatically generated by Cormas.
!! BECAREFUL, You should not modify this method as it can be generated again when changing the value (Sensitivity Analysis for ex) !! "
^restrained ifNil:[restrained := 0]
]

{ #category : #accessing }
ReHabStrategyFamily >> restrained: aSmallInteger [
ReHabFamilyStrategy >> restrained: aSmallInteger [
"Setter accessor of attribute restrained This method was automatically generated by Cormas.
!! BECAREFUL, You should not modify this method as it can be generated again when changing the value (Sensitivity Analysis for ex) !! "
restrained := aSmallInteger
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Class {
#name : #ReHabLoneRider,
#superclass : #ReHabStrategyFamily,
#name : #ReHabLoneRiderStrategy,
#superclass : #ReHabFamilyStrategy,
#category : #'ReHab-Model'
}

{ #category : #accessing }
ReHabLoneRider >> possibleLocations [
ReHabLoneRiderStrategy >> possibleLocations [
| minBiomass |
minBiomass := Cormas
minOf: #biomass
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
Class {
#name : #ReHabManager,
#superclass : #ReHabStrategyParkManager,
#name : #ReHabManagerStrategy,
#superclass : #ReHabParkManagerStrategy,
#category : #'ReHab-Model'
}

{ #category : #accessing }
ReHabManager class >> entityName [
ReHabManagerStrategy class >> entityName [

^ 'Manager'
]

{ #category : #testing }
ReHabManager class >> isAbstract [
ReHabManagerStrategy class >> isAbstract [
^false
]

{ #category : #control }
ReHabManager >> getLocations [
ReHabManagerStrategy >> getLocations [
| corners centralZone edges others |
corners := #(1 5 16 20).
centralZone := self getReserveCentralZoneFrom: corners.
Expand All @@ -34,7 +34,7 @@ ReHabManager >> getLocations [
]

{ #category : #misc }
ReHabManager >> getReserveAround: aZone [
ReHabManagerStrategy >> getReserveAround: aZone [
| coll goodAround |
coll := OrderedCollection new.
coll add: aZone.
Expand All @@ -46,7 +46,7 @@ ReHabManager >> getReserveAround: aZone [
]

{ #category : #misc }
ReHabManager >> getReserveCentralZoneFrom: aColl [
ReHabManagerStrategy >> getReserveCentralZoneFrom: aColl [
| goodLocations |

goodLocations := self holder zones
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Class {
#name : #ReHabMaximizer,
#superclass : #ReHabStrategyFamily,
#name : #ReHabMaximizerStrategy,
#superclass : #ReHabFamilyStrategy,
#category : #'ReHab-Model'
}

{ #category : #accessing }
ReHabMaximizer >> possibleLocations [
ReHabMaximizerStrategy >> possibleLocations [
| maxBiomass |

maxBiomass := Cormas
Expand Down
20 changes: 10 additions & 10 deletions src/ReHab-Model/ReHabModel.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -832,13 +832,13 @@ ReHabModel >> initAgents_Autonomous [
do:
[:f |
f zones: self theZones.
f strategy: (self newEntity: (ReHabStrategyFamily allSubclasses at: self strategy_Family)).
f strategy: (self newEntity: (ReHabFamilyStrategy allSubclasses at: self strategy_Family)).
f strategy holder: f.
f strategy poacher: self poaching.
f strategy restrained: self restrained].
self initAnimals.
self initParkManager.
self parkManager strategy: (self newEntity: (ReHabStrategyParkManager allSubclasses at: self strategy_ParkManager)).
self parkManager strategy: (self newEntity: (ReHabParkManagerStrategy allSubclasses at: self strategy_ParkManager)).
self parkManager strategy holder: self parkManager
]

Expand Down Expand Up @@ -870,7 +870,7 @@ ReHabModel >> initWithProgrammableScenario [
f
strategy:
(self
newEntity: (ReHabStrategyFamily allSubclasses at: self strategy_Family)).
newEntity: (ReHabFamilyStrategy allSubclasses at: self strategy_Family)).
f strategy holder: f.
f strategy poacher: self poaching.
f strategy restrained: self restrained ].
Expand All @@ -880,7 +880,7 @@ ReHabModel >> initWithProgrammableScenario [
strategy:
(self
newEntity:
(ReHabStrategyParkManager allSubclasses
(ReHabParkManagerStrategy allSubclasses
at: self strategy_ParkManager)).
self parkManager strategy holder: self parkManager
]
Expand Down Expand Up @@ -1026,7 +1026,7 @@ ReHabModel >> theBlinds [
"Returns a collection of all the instances of aClass (and sub classes) collected by cormasModel.
!! This method was automatically generated by Cormas !! "

^self allTheEntities: ReHabBlind
^self allTheEntities: ReHabBlindStrategy
]

{ #category : #accessing }
Expand All @@ -1050,7 +1050,7 @@ ReHabModel >> theExplorers [
"Returns a collection of all the instances of aClass (and sub classes) collected by cormasModel.
!! This method was automatically generated by Cormas !! "

^self allTheEntities: ReHabExplorer
^self allTheEntities: ReHabExplorerStrategy
]

{ #category : #accessing }
Expand All @@ -1074,7 +1074,7 @@ ReHabModel >> theLoneRiders [
"Returns a collection of all the instances of aClass (and sub classes) collected by cormasModel.
!! This method was automatically generated by Cormas !! "

^self allTheEntities: ReHabLoneRider
^self allTheEntities: ReHabLoneRiderStrategy
]

{ #category : #accessing }
Expand All @@ -1098,7 +1098,7 @@ ReHabModel >> theMaximizers [
"Returns a collection of all the instances of aClass (and sub classes) collected by cormasModel.
!! This method was automatically generated by Cormas !! "

^self allTheEntities: ReHabMaximizer
^self allTheEntities: ReHabMaximizerStrategy
]

{ #category : #accessing }
Expand Down Expand Up @@ -1146,15 +1146,15 @@ ReHabModel >> theStrategyFamilies [
"Returns a collection of all the instances of aClass (and sub classes) collected by cormasModel.
!! This method was automatically generated by Cormas !! "

^self allTheEntities: ReHabStrategyFamily
^self allTheEntities: ReHabFamilyStrategy
]

{ #category : #accessing }
ReHabModel >> theStrategyParkManagers [
"Returns a collection of all the instances of aClass (and sub classes) collected by cormasModel.
!! This method was automatically generated by Cormas !! "

^self allTheEntities: ReHabStrategyParkManager
^self allTheEntities: ReHabParkManagerStrategy
]

{ #category : #accessing }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Class {
#name : #ReHabStrategyParkManager,
#name : #ReHabParkManagerStrategy,
#superclass : #ReHabStrategy,
#category : #'ReHab-Model'
}

0 comments on commit f21ab3f

Please sign in to comment.