diff --git a/prism/src/parser/PrismParser.java b/prism/src/parser/PrismParser.java index b06f44fa..d3a7271c 100644 --- a/prism/src/parser/PrismParser.java +++ b/prism/src/parser/PrismParser.java @@ -136,8 +136,6 @@ public class PrismParser implements PrismParserConstants { public ModulesFile parseModulesFile(InputStream str, ModelType typeOverride) throws PrismLangException { - new Exception().printStackTrace(System.out); - ModulesFile mf = null; // (Re)start parser diff --git a/prism/src/prism/NondetModel.java b/prism/src/prism/NondetModel.java index 9b5957b3..51736cf1 100644 --- a/prism/src/prism/NondetModel.java +++ b/prism/src/prism/NondetModel.java @@ -384,14 +384,6 @@ public class NondetModel extends ProbModel } else { PrismSparse.ExportMDP(trans, transActions, getSynchs(), getTransSymbol(), allDDRowVars, allDDColVars, allDDNondetVars, odd, exportType, (file != null) ? file.getPath() : null); - if (exportType == Prism.EXPORT_DOT_STATES) { - PrismLog tmpLog; - tmpLog = PrismFileLog.create(file.getPath(), true); - // insert states info into dot file - getReachableStates().printDot(tmpLog); - // print footer - tmpLog.println("}"); - } } } diff --git a/prism/src/simulator/GenerateSimulationPath.java b/prism/src/simulator/GenerateSimulationPath.java index a2a022d2..16b2974d 100644 --- a/prism/src/simulator/GenerateSimulationPath.java +++ b/prism/src/simulator/GenerateSimulationPath.java @@ -341,7 +341,7 @@ public class GenerateSimulationPath private PathDisplayer generateDisplayerForExport() throws PrismException { PrismLog log; - PathToDaikonTrace displayer; + PathToText displayer; if (file != null) { log = new PrismFileLog(file.getPath()); @@ -351,8 +351,8 @@ public class GenerateSimulationPath } else { log = mainLog; } - displayer = new PathToDaikonTrace(log, modulesFile); - //displayer.setColSep(simPathSep); + displayer = new PathToText(log, modulesFile); + displayer.setColSep(simPathSep); displayer.setVarsToShow(simVars); displayer.setShowProbs(simPathShowProbs); displayer.setShowRewards(simPathShowRewards); diff --git a/prism/src/userinterface/model/GUIMultiModelHandler.java b/prism/src/userinterface/model/GUIMultiModelHandler.java index 41d15c5f..90129321 100644 --- a/prism/src/userinterface/model/GUIMultiModelHandler.java +++ b/prism/src/userinterface/model/GUIMultiModelHandler.java @@ -533,7 +533,6 @@ public class GUIMultiModelHandler extends JPanel implements PrismModelListener { tree.stopParsing(); parsing = false; - System.out.println("parsing = false"); parsedModel = m; modifiedSinceParse = false; lastError = "Parse Successful"; @@ -549,7 +548,6 @@ public class GUIMultiModelHandler extends JPanel implements PrismModelListener waiter.interrupt(); } int parseDelay = theModel.getPrism().getSettings().getInteger(PrismSettings.MODEL_PARSE_DELAY); - System.out.println("*"); waiter = new WaitParseThread(parseDelay, this); waiter.start(); //Funky thread waiting stuff @@ -946,7 +944,6 @@ public class GUIMultiModelHandler extends JPanel implements PrismModelListener // If the flag has just been switched ON, do a parse... if (autoParse) { - System.out.println("## " + parsing); tree.makeNotUpToDate(); theModel.notifyEventListeners(new GUIModelEvent(GUIModelEvent.MODIFIED_SINCE_SAVE)); if (!parsing) { @@ -959,7 +956,6 @@ public class GUIMultiModelHandler extends JPanel implements PrismModelListener waiter.start(); } } else { - System.out.println("**"); parseAfterParse = true; } theModel.doEnables(); @@ -1214,9 +1210,6 @@ public class GUIMultiModelHandler extends JPanel implements PrismModelListener public WaitParseThread(int time, GUIMultiModelHandler handler) { - new Exception().printStackTrace(System.out); - - this.time = time; this.handler = handler; } @@ -1225,7 +1218,6 @@ public class GUIMultiModelHandler extends JPanel implements PrismModelListener { try { sleep(time); - System.out.println(time); parseThread = new ParseModelThread(handler, editor.getParseText(), currentMode == PEPA_MODE, isAutoParse()); parsing = true; tree.startParsing();