Skip to content

Commit

Permalink
Merge pull request #118 from oskopek/PLANNER-48-codestyle
Browse files Browse the repository at this point in the history
PLANNER-48: Code Style fix
  • Loading branch information
ge0ffrey committed Aug 3, 2015
2 parents 680c991 + 897404a commit 2451669
Showing 1 changed file with 3 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,8 @@ private void backupTerminationConfigs(Map<SolverBenchmarkResult, TerminationConf
}

private void warmUpPopulate(Map<Future<SingleBenchmarkRunner>, SingleBenchmarkRunner> futureMap,
ConcurrentMap<SolverBenchmarkResult, Integer> singleBenchmarkResultIndexMap,
SolverBenchmarkResult[] solverBenchmarkResultArray,
long timeLeftPerSolverConfig) {
ConcurrentMap<SolverBenchmarkResult, Integer> singleBenchmarkResultIndexMap,
SolverBenchmarkResult[] solverBenchmarkResultArray, long timeLeftPerSolverConfig) {
for (SolverBenchmarkResult solverBenchmarkResult : solverBenchmarkResultArray) {
TerminationConfig originalTerminationConfig = solverBenchmarkResult.getSolverConfig().getTerminationConfig();
TerminationConfig tmpTerminationConfig = originalTerminationConfig == null
Expand All @@ -201,7 +200,7 @@ private void warmUpPopulate(Map<Future<SingleBenchmarkRunner>, SingleBenchmarkRu
}

private void warmUp(Map<Future<SingleBenchmarkRunner>, SingleBenchmarkRunner> futureMap,
ConcurrentMap<SolverBenchmarkResult, Integer> singleBenchmarkResultIndexMap, long timePhaseEnd) {
ConcurrentMap<SolverBenchmarkResult, Integer> singleBenchmarkResultIndexMap, long timePhaseEnd) {
// Wait for the warm up benchmarks to complete
int tasksCount = futureMap.size();
// Use a counter because completion order of futures is different from input order
Expand Down

0 comments on commit 2451669

Please sign in to comment.