Commit 4d32f444 authored by Jonathan Shahen's avatar Jonathan Shahen

Better numbers in the printout; now the first testcase prints out 1 instead of 0

parent 8df1fdc7
package mohawk.testing;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.*;
import java.util.ArrayList;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.*;
import java.util.logging.Level;
import java.util.logging.Logger;
import mohawk.collections.NuSMVMode;
import mohawk.global.results.ExecutionResult;
import mohawk.global.results.MohawkResults;
import mohawk.global.results.TestingResult;
import mohawk.global.results.*;
import mohawk.global.timing.MohawkTiming;
import mohawk.helper.SMVSpecHelper;
import mohawk.math.CalculateDiameter;
......@@ -123,7 +112,7 @@ public class TestingSuite {
/* TIMING */timing.startTimer("runTests.mainLoop (" + i + "/" + numSpecFiles + ")");
for (Integer j = 0; j < modes.size(); j++) {
String specFile = smvHelper.specFiles.get(i).getAbsolutePath();
String timerName = "runTests.mainLoop (" + i + "/" + numSpecFiles + ") - "
String timerName = "runTests.mainLoop (" + (i + 1) + "/" + numSpecFiles + ") - "
+ smvHelper.specFiles.get(i).getName() + " (" + modes.get(j) + ")";
/* TIMING */timing.startTimer(timerName);
......@@ -172,7 +161,7 @@ public class TestingSuite {
// Setup Timeout Timer
Future<ExecutionResult> future = executor.submit(new TestRunner(absrefine, skipRefine));
try {
logger.info("[RUNNING] Running Mohawk on testcase " + i + "/" + numSpecFiles + " (mode="
logger.info("[RUNNING] Running Mohawk on testcase " + (i + 1) + "/" + numSpecFiles + " (mode="
+ modes.get(j) + "):");
if (smvHelper.TIMEOUT_SECONDS == 0) {
......@@ -217,7 +206,7 @@ public class TestingSuite {
logger.info("Previous Elapsed Time: " + timing.getLastElapsedTimeSec() + " seconds");
}
/* TIMING */timing.stopTimer("runTests.mainLoop (" + i + "/" + numSpecFiles + ")");
/* TIMING */timing.stopTimer("runTests.mainLoop (" + (i + 1) + "/" + numSpecFiles + ")");
}
executor.shutdown();
resultsFW.close();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment