Skip to content

Commit e28fe61

Browse files
arcuri82arcuri82
committed
minor refactoring
1 parent 194c859 commit e28fe61

12 files changed

Lines changed: 32 additions & 33 deletions

‎core/src/main/kotlin/org/evomaster/core/Main.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ class Main {
300300

301301
solution.statistics = data.toMutableList()
302302

303-
epc.finishSearch()
303+
epc.finishSession()
304304

305305
return solution
306306
}

‎core/src/main/kotlin/org/evomaster/core/search/service/time/ExecutionPhaseController.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package org.evomaster.core.search.service.time
22

33
import org.evomaster.core.EMConfig
44
import org.evomaster.core.logging.LoggingUtil
5-
import org.evomaster.core.search.service.time.SearchTimeController
65
import org.evomaster.core.utils.TimeUtils
76
import javax.inject.Inject
87

@@ -45,7 +44,7 @@ class ExecutionPhaseController {
4544
startPhase(Phase.SEARCH)
4645
}
4746

48-
fun finishSearch() {
47+
fun finishSession() {
4948
startPhase(Phase.FINISHED)
5049
}
5150

‎core/src/test/kotlin/org/evomaster/core/search/algorithms/BreederGeneticAlgorithmTest.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class BreederGeneticAlgorithmTest {
4646
val epc = injector.getInstance(ExecutionPhaseController::class.java)
4747
epc.startSearch()
4848
val solution = breederGA.search()
49-
epc.finishSearch()
49+
epc.finishSession()
5050

5151
assertTrue(solution.individuals.size == 1)
5252
assertEquals(OneMaxSampler.DEFAULT_N.toDouble(), solution.overall.computeFitnessScore(), 0.001)
@@ -167,13 +167,13 @@ class BreederGeneticAlgorithmTest {
167167
val nextPop = breederGA.getViewOfPopulation()
168168
assertEquals(config.populationSize, nextPop.size)
169169

170-
// crossovers happen once per iteration (mutation probability = 1)
170+
// crossovers happen once per iteration (mutation probability = 1)
171171
assertEquals(config.populationSize, rec.xoCalls.size)
172172

173173
// mutations disabled
174174
assertEquals(0, rec.mutated.size)
175175
}
176176
}
177177

178-
178+
179179
}

‎core/src/test/kotlin/org/evomaster/core/search/algorithms/CellularGeneticAlgorithmTest.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@ class CellularGeneticAlgorithmTest {
9090
val epc = injector.getInstance(ExecutionPhaseController::class.java)
9191
epc.startSearch()
9292
val solution = cga.search()
93-
epc.finishSearch()
93+
epc.finishSession()
9494

9595
assertTrue(solution.individuals.size == 1)
9696
assertEquals(OneMaxSampler.DEFAULT_N.toDouble(), solution.overall.computeFitnessScore(), 0.001)
9797
}
9898
}
99-
99+
100100
// Edge Case: CrossoverProbability=0 and MutationProbability=1 on CGA
101101
@Test
102102
fun testNoCrossoverWhenProbabilityZero_CGA() {
@@ -167,7 +167,7 @@ class CellularGeneticAlgorithmTest {
167167
// two selections per iteration
168168
assertEquals(2 * n, rec.selections.size)
169169
// one crossover per iteration (crossover probability = 1)
170-
assertEquals(n, rec.xoCalls.size)
170+
assertEquals(n, rec.xoCalls.size)
171171
// mutation disabled
172172
assertEquals(0, rec.mutated.size)
173173
}

‎core/src/test/kotlin/org/evomaster/core/search/algorithms/CroAlgorithmTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class CroAlgorithmTest {
5858
val epc = injector.getInstance(ExecutionPhaseController::class.java)
5959
epc.startSearch()
6060
val solution = cro.search()
61-
epc.finishSearch()
61+
epc.finishSession()
6262

6363
assertTrue(solution.individuals.size == 1)
6464
assertEquals(OneMaxSampler.DEFAULT_N.toDouble(), solution.overall.computeFitnessScore(), 0.001)
@@ -102,7 +102,7 @@ class CroAlgorithmTest {
102102
}
103103
}
104104

105-
105+
106106

107107
@Test
108108
fun testUniMolecular_DecompositionPath_rejected_NoReplacementAndParentCollisionsIncrement() {

‎core/src/test/kotlin/org/evomaster/core/search/algorithms/LIPSAlgorithmTest.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class LIPSAlgorithmTest {
3232
// Verifies that the LIPS algorithm can find the optimal solution for the OneMax problem
3333
@Test
3434
fun testLipsFindsOptimumOnOneMax() {
35-
35+
3636
val lips = injector.getInstance(
3737
Key.get(object : TypeLiteral<LIPSAlgorithm<OneMaxIndividual>>() {})
3838
)
@@ -44,7 +44,7 @@ class LIPSAlgorithmTest {
4444
val epc = injector.getInstance(ExecutionPhaseController::class.java)
4545
epc.startSearch()
4646
val solution = lips.search()
47-
epc.finishSearch()
47+
epc.finishSession()
4848

4949
assertTrue(solution.individuals.size == 1)
5050
assertEquals(
@@ -53,7 +53,7 @@ class LIPSAlgorithmTest {
5353
0.001
5454
)
5555
}
56-
56+
5757
// Edge Case: CrossoverProbability=0 on LIPS
5858
@Test
5959
fun testNoCrossoverWhenProbabilityZero_LIPS() {
@@ -169,7 +169,7 @@ class LIPSAlgorithmTest {
169169
assertEquals(neededFromOffspring, rec.mutated.size)
170170
}
171171
}
172-
172+
173173
}
174174

175175

‎core/src/test/kotlin/org/evomaster/core/search/algorithms/MonotonicGeneticAlgorithmTest.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ class MonotonicGeneticAlgorithmTest {
4646
val epc = injector.getInstance(ExecutionPhaseController::class.java)
4747
epc.startSearch()
4848
val solution = monoGA.search()
49-
epc.finishSearch()
49+
epc.finishSession()
5050
assertTrue(solution.individuals.size == 1)
5151
assertEquals(OneMaxSampler.DEFAULT_N.toDouble(), solution.overall.computeFitnessScore(), 0.001)
5252
}
5353
}
5454

55-
55+
5656
// Tests Edge Case: CrossoverProbability=0 on Monotonic GA
5757
@Test
5858
fun testNoCrossoverWhenProbabilityZero_Monotonic() {
@@ -97,7 +97,7 @@ class MonotonicGeneticAlgorithmTest {
9797
assertEquals(2, rec.mutated.size)
9898
}
9999
}
100-
100+
101101
// Tests Edge Case: MutationProbability=0 on Monotonic GA
102102
@Test
103103
fun testNoMutationWhenProbabilityZero_Monotonic() {
@@ -118,7 +118,7 @@ class MonotonicGeneticAlgorithmTest {
118118
config.gaSolutionSource = EMConfig.GASolutionSource.POPULATION
119119
config.maxEvaluations = 100_000
120120
config.stoppingCriterion = EMConfig.StoppingCriterion.ACTION_EVALUATIONS
121-
121+
122122
ga.setupBeforeSearch()
123123

124124
val pop = ga.getViewOfPopulation()
@@ -139,7 +139,7 @@ class MonotonicGeneticAlgorithmTest {
139139
// crossover forced
140140
assertEquals(1, rec.xoCalls.size)
141141
// mutation disabled
142-
assertEquals(0, rec.mutated.size)
142+
assertEquals(0, rec.mutated.size)
143143
}
144144
}
145145
// Verifies that one generation is formed by elites plus monotonic replacement outcome
@@ -163,7 +163,7 @@ class MonotonicGeneticAlgorithmTest {
163163
config.gaSolutionSource = EMConfig.GASolutionSource.POPULATION
164164
config.maxEvaluations = 100_000
165165
config.stoppingCriterion = EMConfig.StoppingCriterion.ACTION_EVALUATIONS
166-
166+
167167
ga.setupBeforeSearch()
168168

169169
val pop = ga.getViewOfPopulation()
@@ -213,7 +213,7 @@ class MonotonicGeneticAlgorithmTest {
213213
assertTrue(rec.mutated.any { it === o2 })
214214
}
215215
}
216-
216+
217217
// Ensures that maximum fitness never decreases across generations when running full search
218218
@Test
219219
fun testMonotonicReplacementRule() {
@@ -234,7 +234,7 @@ class MonotonicGeneticAlgorithmTest {
234234
val epc = injector.getInstance(ExecutionPhaseController::class.java)
235235
epc.startSearch()
236236
val solution = monoGA.search()
237-
epc.finishSearch()
237+
epc.finishSession()
238238
// Check monotonicity across recorded generations: best score (selection metric) is non-decreasing
239239
val bestScores = rec.bestFitnessPerGeneration
240240
for (k in 1 until bestScores.size) {

‎core/src/test/kotlin/org/evomaster/core/search/algorithms/MuLambdaEvolutionaryAlgorithmTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class MuLambdaEvolutionaryAlgorithmTest {
4545
val epc = injector.getInstance(ExecutionPhaseController::class.java)
4646
epc.startSearch()
4747
val solution = ea.search()
48-
epc.finishSearch()
48+
epc.finishSession()
4949

5050
assertEquals(1, solution.individuals.size)
5151
assertEquals(OneMaxSampler.DEFAULT_N.toDouble(), solution.overall.computeFitnessScore(), 0.001)

‎core/src/test/kotlin/org/evomaster/core/search/algorithms/MuPlusLambdaEvolutionaryAlgorithmTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class MuPlusLambdaEvolutionaryAlgorithmTest {
4545
val epc = injector.getInstance(ExecutionPhaseController::class.java)
4646
epc.startSearch()
4747
val solution = ea.search()
48-
epc.finishSearch()
48+
epc.finishSession()
4949

5050
assertEquals(1, solution.individuals.size)
5151
assertEquals(OneMaxSampler.DEFAULT_N.toDouble(), solution.overall.computeFitnessScore(), 0.001)

‎core/src/test/kotlin/org/evomaster/core/search/algorithms/OnePlusLambdaLambdaGeneticAlgorithmTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class OnePlusLambdaLambdaGeneticAlgorithmTest {
4444
val epc = injector.getInstance(ExecutionPhaseController::class.java)
4545
epc.startSearch()
4646
val solution = ga.search()
47-
epc.finishSearch()
47+
epc.finishSession()
4848

4949
assertEquals(1, solution.individuals.size)
5050
assertEquals(OneMaxSampler.DEFAULT_N.toDouble(), solution.overall.computeFitnessScore(), 0.001)
@@ -166,7 +166,7 @@ class OnePlusLambdaLambdaGeneticAlgorithmTest {
166166
} else {
167167
assertTrue(p1 === parent0)
168168
}
169-
169+
170170
}
171171
}
172172

0 commit comments

Comments
 (0)