Browse Source

Remove accidental commits

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10816 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 10 years ago
parent
commit
d4c5fd4fd5
  1. 2
      prism/src/parser/PrismParser.java
  2. 8
      prism/src/prism/NondetModel.java
  3. 6
      prism/src/simulator/GenerateSimulationPath.java
  4. 8
      prism/src/userinterface/model/GUIMultiModelHandler.java

2
prism/src/parser/PrismParser.java

@ -136,8 +136,6 @@ public class PrismParser implements PrismParserConstants {
public ModulesFile parseModulesFile(InputStream str, ModelType typeOverride) throws PrismLangException public ModulesFile parseModulesFile(InputStream str, ModelType typeOverride) throws PrismLangException
{ {
new Exception().printStackTrace(System.out);
ModulesFile mf = null; ModulesFile mf = null;
// (Re)start parser // (Re)start parser

8
prism/src/prism/NondetModel.java

@ -384,14 +384,6 @@ public class NondetModel extends ProbModel
} else { } else {
PrismSparse.ExportMDP(trans, transActions, getSynchs(), getTransSymbol(), allDDRowVars, allDDColVars, allDDNondetVars, odd, exportType, PrismSparse.ExportMDP(trans, transActions, getSynchs(), getTransSymbol(), allDDRowVars, allDDColVars, allDDNondetVars, odd, exportType,
(file != null) ? file.getPath() : null); (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("}");
}
} }
} }

6
prism/src/simulator/GenerateSimulationPath.java

@ -341,7 +341,7 @@ public class GenerateSimulationPath
private PathDisplayer generateDisplayerForExport() throws PrismException private PathDisplayer generateDisplayerForExport() throws PrismException
{ {
PrismLog log; PrismLog log;
PathToDaikonTrace displayer;
PathToText displayer;
if (file != null) { if (file != null) {
log = new PrismFileLog(file.getPath()); log = new PrismFileLog(file.getPath());
@ -351,8 +351,8 @@ public class GenerateSimulationPath
} else { } else {
log = mainLog; log = mainLog;
} }
displayer = new PathToDaikonTrace(log, modulesFile);
//displayer.setColSep(simPathSep);
displayer = new PathToText(log, modulesFile);
displayer.setColSep(simPathSep);
displayer.setVarsToShow(simVars); displayer.setVarsToShow(simVars);
displayer.setShowProbs(simPathShowProbs); displayer.setShowProbs(simPathShowProbs);
displayer.setShowRewards(simPathShowRewards); displayer.setShowRewards(simPathShowRewards);

8
prism/src/userinterface/model/GUIMultiModelHandler.java

@ -533,7 +533,6 @@ public class GUIMultiModelHandler extends JPanel implements PrismModelListener
{ {
tree.stopParsing(); tree.stopParsing();
parsing = false; parsing = false;
System.out.println("parsing = false");
parsedModel = m; parsedModel = m;
modifiedSinceParse = false; modifiedSinceParse = false;
lastError = "Parse Successful"; lastError = "Parse Successful";
@ -549,7 +548,6 @@ public class GUIMultiModelHandler extends JPanel implements PrismModelListener
waiter.interrupt(); waiter.interrupt();
} }
int parseDelay = theModel.getPrism().getSettings().getInteger(PrismSettings.MODEL_PARSE_DELAY); int parseDelay = theModel.getPrism().getSettings().getInteger(PrismSettings.MODEL_PARSE_DELAY);
System.out.println("*");
waiter = new WaitParseThread(parseDelay, this); waiter = new WaitParseThread(parseDelay, this);
waiter.start(); waiter.start();
//Funky thread waiting stuff //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 the flag has just been switched ON, do a parse...
if (autoParse) { if (autoParse) {
System.out.println("## " + parsing);
tree.makeNotUpToDate(); tree.makeNotUpToDate();
theModel.notifyEventListeners(new GUIModelEvent(GUIModelEvent.MODIFIED_SINCE_SAVE)); theModel.notifyEventListeners(new GUIModelEvent(GUIModelEvent.MODIFIED_SINCE_SAVE));
if (!parsing) { if (!parsing) {
@ -959,7 +956,6 @@ public class GUIMultiModelHandler extends JPanel implements PrismModelListener
waiter.start(); waiter.start();
} }
} else { } else {
System.out.println("**");
parseAfterParse = true; parseAfterParse = true;
} }
theModel.doEnables(); theModel.doEnables();
@ -1214,9 +1210,6 @@ public class GUIMultiModelHandler extends JPanel implements PrismModelListener
public WaitParseThread(int time, GUIMultiModelHandler handler) public WaitParseThread(int time, GUIMultiModelHandler handler)
{ {
new Exception().printStackTrace(System.out);
this.time = time; this.time = time;
this.handler = handler; this.handler = handler;
} }
@ -1225,7 +1218,6 @@ public class GUIMultiModelHandler extends JPanel implements PrismModelListener
{ {
try { try {
sleep(time); sleep(time);
System.out.println(time);
parseThread = new ParseModelThread(handler, editor.getParseText(), currentMode == PEPA_MODE, isAutoParse()); parseThread = new ParseModelThread(handler, editor.getParseText(), currentMode == PEPA_MODE, isAutoParse());
parsing = true; parsing = true;
tree.startParsing(); tree.startParsing();

Loading…
Cancel
Save