explicit: Make calls to StateModelChecker.loadLabelsFile static

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11747 bbc10eb1-c90d-0410-af57-cb519fbb1720

prism/src/explicit/CTMCModelChecker.java

@@ -935,7 +935,7 @@ public class CTMCModelChecker extends ProbModelChecker
 			ctmc.buildFromPrismExplicit(args[0]);
 			ctmc.addInitialState(0);
 			//System.out.println(ctmc);
-			labels = mc.loadLabelsFile(args[1]);
+			labels = StateModelChecker.loadLabelsFile(args[1]);
 			//System.out.println(labels);
 			target = labels.get(args[2]);
 			if (target == null)

prism/src/explicit/CTMDPModelChecker.java

@@ -286,7 +286,7 @@ public class CTMDPModelChecker extends ProbModelChecker
 			ctmdp.buildFromPrismExplicit(args[0]);
 			ctmdp.addInitialState(0);
 			System.out.println(ctmdp);
-			labels = mc.loadLabelsFile(args[1]);
+			labels = StateModelChecker.loadLabelsFile(args[1]);
 			System.out.println(labels);
 			target = labels.get(args[2]);
 			if (target == null)

prism/src/explicit/DTMCModelChecker.java

@@ -1624,7 +1624,7 @@ public class DTMCModelChecker extends ProbModelChecker
 				dtmc.buildFromPrismExplicit(args[0]);
 				dtmc.addInitialState(0);
 				//System.out.println(dtmc);
-				Map<String, BitSet> labels = mc.loadLabelsFile(args[1]);
+				Map<String, BitSet> labels = StateModelChecker.loadLabelsFile(args[1]);
 				//System.out.println(labels);
 				BitSet target = labels.get(args[2]);
 				if (target == null)

prism/src/explicit/MDPModelChecker.java

@@ -1756,7 +1756,7 @@ public class MDPModelChecker extends ProbModelChecker
 			mdp.buildFromPrismExplicit(args[0]);
 			mdp.addInitialState(0);
 			//System.out.println(mdp);
-			labels = mc.loadLabelsFile(args[1]);
+			labels = StateModelChecker.loadLabelsFile(args[1]);
 			//System.out.println(labels);
 			init = labels.get("init");
 			target = labels.get(args[2]);

prism/src/explicit/PrismSTPGAbstractRefine.java

@@ -116,8 +116,9 @@ public class PrismSTPGAbstractRefine extends QuantAbstractRefine
 			}
 		}
 
+		new StateModelChecker(null);
 		// Get initial/target (concrete) states
-		labels = new StateModelChecker(null).loadLabelsFile(labFile);
+		labels = StateModelChecker.loadLabelsFile(labFile);
 		initialConcrete = labels.get("init");
 		targetConcrete = labels.get(targetLabel);
 		if (targetConcrete == null)

prism/src/explicit/STPGModelChecker.java

@@ -920,7 +920,7 @@ public class STPGModelChecker extends ProbModelChecker
 			stpg.buildFromPrismExplicit(args[0]);
 			stpg.addInitialState(0);
 			//System.out.println(stpg);
-			labels = mc.loadLabelsFile(args[1]);
+			labels = StateModelChecker.loadLabelsFile(args[1]);
 			//System.out.println(labels);
 			target = labels.get(args[2]);
 			if (target == null)