Changed variable glpk requirements to be in the .jar instead of the t…

…racked class

Removed sed

prism/Makefile

@@ -337,7 +337,6 @@ exact_lp_requirements: checks
 	else echo "Warning: LIBTOOL not found. Required for GLPK java bindings."; fi
 	@if [ "$(DETECT_ACLOCAL)" != "" ]; then echo "Found ACLOCAL in $(DETECT_ACLOCAL)"; \
 	else echo "Warning: ACLOCAL not found. Required for both GLPK and GLPK java bindings."; fi
-	@sed -i '/EXACT_LP_REQUIREMENTS_INSTALLED/c\	public final int EXACT_LP_REQUIREMENTS_INSTALLED = $(EXACT_LP_REQUIREMENTS_INSTALLED);' src/prism/PrismSettings.java;
 
 cuddpackage: checks
 	@if [ "$(CUDD_DIR)" = "" ]; then echo "Error: Cannot find CUDD"; exit 1; fi

prism/ext/glpk_java/libglpk_java_exact.patch

@@ -11,6 +11,18 @@ index bf7d91f..e5ba65f 100644
 
  // Add handling for String arrays in glp_main
  %include "various.i"
+diff --git a/swig/glpk_java.h b/swig/glpk_java.h
+index afb5b30..c6bf6b1 100644
+--- a/swig/glpk_java.h
++++ b/swig/glpk_java.h
+@@ -8,6 +8,7 @@
+
+ #define GLP_JAVA_MSG_LVL_OFF 0
+ #define GLP_JAVA_MSG_LVL_ALL 1
++#define EXACT_LP_REQUIREMENTS 1
+ void glp_java_error(char *message);
+ void glp_java_set_msg_lvl(int msg_lvl);
+ void glp_java_set_numeric_locale(const char *locale);
 diff --git a/swig/glpk_java_arrays.i b/swig/glpk_java_arrays.i
 index 214cec7..e4ecaaa 100644
 --- a/swig/glpk_java_arrays.i

prism/src/explicit/DTMCModelChecker.java

@@ -529,7 +529,7 @@ public ModelCheckerResult computeReachProbs(DTMC dtmc, BitSet remain, BitSet tar
 
 		// Switch to a supported method, if necessary
 		if (!(linEqMethod == LinEqMethod.POWER || linEqMethod == LinEqMethod.GAUSS_SEIDEL
-				|| linEqMethod == LinEqMethod.EXACT_LINEAR_PROGRAMMING || settings.EXACT_LP_REQUIREMENTS_INSTALLED == 0)) {
+				|| linEqMethod == LinEqMethod.EXACT_LINEAR_PROGRAMMING || GLPK.EXACT_LP_REQUIREMENTS == 0)) {
 			linEqMethod = LinEqMethod.GAUSS_SEIDEL;
 			mainLog.printWarning("Switching to linear equation solution method \"" + linEqMethod.fullName() + "\"");
 		}

prism/src/explicit/MDPModelChecker.java

@@ -346,7 +346,7 @@ public ModelCheckerResult computeReachProbs(MDP mdp, BitSet remain, BitSet targe
 		MDPSolnMethod mdpSolnMethod = this.mdpSolnMethod;
 
 		// Switch to a supported method, if necessary
-		if (settings.EXACT_LP_REQUIREMENTS_INSTALLED == 0) {
+		if (GLPK.EXACT_LP_REQUIREMENTS == 0) {
 			mdpSolnMethod = MDPSolnMethod.GAUSS_SEIDEL;
 			mainLog.printWarning("Cannot compute exact linear programming. GLPK libraries are not properly installed");
 			mainLog.printWarning("Switching to MDP solution method \"" + mdpSolnMethod.fullName() + "\"");
@@ -1282,6 +1282,7 @@ protected ModelCheckerResult computeReachProbsExactLinearProg(MDP mdp, BitSet no
 		sol = GLPK.glp_get_obj_val(lp);
 		String currentResult;
 		int exp;
+
 		mainLog.println("\n" + this.getPrecision() + "-bit results (non-zero only) for each state of the MDP:");
 		for (int mdpState = 0; mdpState < nStates; mdpState++) {
 			if (maybe.get(mdpState)) {

prism/src/prism/Makefile

@@ -64,7 +64,6 @@ $(PRISM_DIR_REL)/$(OBJ_DIR)/$(THIS_DIR)/ngprism$(EXE): ngprism.c
 
 clean: checks
 	@rm -f $(CLASS_FILES) $(PRISM_DIR_REL)/$(LIB_DIR)/$(LIBPREFIX)prism$(LIBSUFFIX) $(O_FILES) $(PRISM_DIR_REL)/$(OBJ_DIR)/$(THIS_DIR)/ngprism$(EXE)
-	@sed -i '/EXACT_LP_REQUIREMENTS_INSTALLED/c\	public final int EXACT_LP_REQUIREMENTS_INSTALLED = 1;' PrismSettings.java
 
 celan: clean
 

prism/src/prism/PrismSettings.java

@@ -425,9 +425,6 @@ public class PrismSettings implements Observer
 
 	public static final String[] oldPropertyNames =  {"simulator.apmcStrategy", "simulator.engine", "simulator.newPathAskDefault"};
 
-	//Exact LP requirements
-	public final int EXACT_LP_REQUIREMENTS_INSTALLED = 1;
-
 	public DefaultSettingOwner[] optionOwners;
 	private Hashtable<String,Setting> data;
 	private boolean modified;