Skip to content

Commit 194c859

Browse files
committed
yet more cleaning code
1 parent 4cf8ff8 commit 194c859

6 files changed

Lines changed: 12 additions & 9 deletions

File tree

core/src/main/kotlin/org/evomaster/core/search/service/FitnessFunction.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ abstract class FitnessFunction<T> where T : Individual {
6161

6262
val a = individual.seeMainExecutableActions().count()
6363

64-
// val calculatedBefore = individual.copy()
65-
6664
if(time.averageOverheadMsBetweenTests.isRecordingTimer()){
6765
val computation = time.averageOverheadMsBetweenTests.addElapsedTime()
6866
executionInfoReporter.addLatestComputationOverhead(computation, time.evaluatedIndividuals)

core/src/main/kotlin/org/evomaster/core/search/service/Statistics.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ class Statistics : SearchListener {
234234

235235
fun averageNumberOfEvaluatedDocumentsForRedisHeuristics(): Double = redisDocumentsAverageCalculator.mean
236236

237-
override fun newActionEvaluated() {
237+
override fun newActionsEvaluated(n: Int) {
238238

239239
if(!epc.isInSearch()){
240240
//we are only taking snapshots during the search

core/src/main/kotlin/org/evomaster/core/search/service/monitor/SearchProcessMonitor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class SearchProcessMonitor: SearchListener {
124124
}
125125
}
126126

127-
override fun newActionEvaluated() {
127+
override fun newActionsEvaluated(n: Int) {
128128
if(config.enableProcessMonitor && config.processFormat == EMConfig.ProcessDataFormat.JSON_ALL){
129129
step = StepOfSearchProcess(archive, time.evaluatedIndividuals, eval!!.individual, eval!!, System.currentTimeMillis(),isMutated)
130130
}

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

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

33
interface SearchListener {
44

5-
fun newActionEvaluated()
5+
fun newActionsEvaluated(n: Int)
66
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,12 @@ class SearchStatusUpdater : SearchListener {
7070
}
7171
}
7272

73-
override fun newActionEvaluated() {
73+
override fun newActionsEvaluated(n: Int) {
7474

7575
when {
7676
epc.isInSearch() -> printForSearch()
77-
//TODO else
77+
//TODO else for other phases
78+
//TODO could save n in epc, and show progress bar with its value
7879
}
7980
}
8081

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,13 @@ class SearchTimeController {
202202
}
203203

204204
fun newActionEvaluation(n: Int = 1) {
205-
if(!recording) return
205+
206+
listeners.forEach{it.newActionsEvaluated(n)}
207+
208+
if(!recording){
209+
return
210+
}
206211
evaluatedActions += n
207-
listeners.forEach{it.newActionEvaluated()}
208212
}
209213

210214
fun newCoveredTarget(){

0 commit comments

Comments
 (0)