Cody tidy to remove some (C++) compiler errors.

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

prism/src/dd/dd_cudd.cc

@@ -211,7 +211,7 @@ int Cudd_CheckZeroRefVerbose(DdManager *manager)
 			count++;
 		 	}
 		} else {
-			printf("* constant found (index %d)\n", node->type.value);
+			printf("* constant found (index %g)\n", node->type.value);
 		 	count++;
 		}
 	 	}

prism/src/dd/dd_export.cc

@@ -60,7 +60,7 @@ char *filename
 		// crash out
 		return;
 	}
-	DD_ExportDDToDotFileLabelled(ddman, dd, fp, "DD", NULL);
+	DD_ExportDDToDotFileLabelled(ddman, dd, fp, (char*)"DD", NULL);
 	fclose(fp);
 }
 
@@ -79,7 +79,7 @@ char **var_names
 		// crash out
 		return;
 	}
-	DD_ExportDDToDotFileLabelled(ddman, dd, fp, "DD", var_names);
+	DD_ExportDDToDotFileLabelled(ddman, dd, fp, (char*)"DD", var_names);
 	fclose(fp);
 }
 
@@ -92,7 +92,7 @@ DdNode *dd,
 FILE *fp
 )
 {
-	DD_ExportDDToDotFileLabelled(ddman, dd, fp, "DD", NULL);
+	DD_ExportDDToDotFileLabelled(ddman, dd, fp, (char*)"DD", NULL);
 }
 
 //------------------------------------------------------------------------------
@@ -176,7 +176,7 @@ FILE *fp
 		stored[count++] = dd;
 	}
 	
-	fprintf(fp, "%z\n", (size_t)dd);
+	fprintf(fp, "%d\n", (size_t)dd);
 	return 0;
 }
 

prism/src/dd/dd_matrix.cc

@@ -266,7 +266,6 @@ int num_vars
 )
 {
 	DdNode *tmp;
-	int i, size;
 	
 	tmp = Cudd_addXeqy(ddman, num_vars, rvars, cvars);
 	Cudd_Ref(tmp);
@@ -392,7 +391,7 @@ int accuracy
 		case ACCURACY_LOW: fprintf(dd_out, "%.2f ", val); break;
 		case ACCURACY_NORMAL: fprintf(dd_out, "%f ", val); break;
 		case ACCURACY_HIGH: fprintf(dd_out, "%.10f ", val); break;
-		case ACCURACY_LIST: if (val>0) fprintf(dd_out, "%d:%f ", i, val); break;
+		case ACCURACY_LIST: if (val>0) fprintf(dd_out, "%ld:%f ", i, val); break;
 		}
 	}
 	fprintf(dd_out, "\n");
@@ -528,7 +527,7 @@ int accuracy
 			case ACCURACY_LOW: fprintf(dd_out, "%.2f ", val); break;
 			case ACCURACY_NORMAL: fprintf(dd_out, "%f ", val); break;
 			case ACCURACY_HIGH: fprintf(dd_out, "%.10f ", val); break;
-			case ACCURACY_LIST: if (val>0) fprintf(dd_out, "%d:%f ", count, val); break;
+			case ACCURACY_LIST: if (val>0) fprintf(dd_out, "%ld:%f ", count, val); break;
 			}
 		}
 	}

prism/src/dv/dv.cc

@@ -185,6 +185,8 @@ DdNode *double_vector_to_bdd_rec(DdManager *ddman, double *vec, int rel_op, doub
 			return DD_ITE(ddman, vars[level], t, e);
 		}
 	}
+	// Never get here:
+	return NULL;
 }	
 
 //------------------------------------------------------------------------------

prism/src/hybrid/PH_JOR.cc

@@ -167,7 +167,7 @@ jdouble omega		// omega (over-relaxation parameter)
 	// try and convert to compact form if required
 	compact_d = false;
 	if (compact) {
-		if (diags_dist = double_vector_to_dist(diags_vec, n)) {
+		if ((diags_dist = double_vector_to_dist(diags_vec, n))) {
 			compact_d = true;
 			delete[] diags_vec; diags_vec = NULL;
 		}
@@ -191,7 +191,7 @@ jdouble omega		// omega (over-relaxation parameter)
 		// try and convert to compact form if required
 		compact_b = false;
 		if (compact) {
-			if (b_dist = double_vector_to_dist(b_vec, n)) {
+			if ((b_dist = double_vector_to_dist(b_vec, n))) {
 				compact_b = true;
 				delete[] b_vec; b_vec = NULL;
 			}

prism/src/hybrid/PH_NondetBoundedUntil.cc

@@ -138,7 +138,7 @@ jboolean min		// min or max probabilities (true = min, false = max)
 	compact_y = false;
 	// try and convert to compact form if required
 	if (compact) {
-		if (yes_dist = double_vector_to_dist(yes_vec, n)) {
+		if ((yes_dist = double_vector_to_dist(yes_vec, n))) {
 			compact_y = true;
 			delete[] yes_vec; yes_vec = NULL;
 		}

prism/src/hybrid/PH_NondetReachReward.cc

@@ -176,7 +176,7 @@ jboolean min		// min or max probabilities (true = min, false = max)
 	// try and convert to compact form if required
 	compact_r = false;
 	if (compact) {
-		if (rew_dist = double_vector_to_dist(rew_vec, n)) {
+		if ((rew_dist = double_vector_to_dist(rew_vec, n))) {
 			compact_r = true;
 			delete rew_vec; rew_vec = NULL;
 		}

prism/src/hybrid/PH_NondetUntil.cc

@@ -138,7 +138,7 @@ jboolean min		// min or max probabilities (true = min, false = max)
 	compact_y = false;
 	// try and convert to compact form if required
 	if (compact) {
-		if (yes_dist = double_vector_to_dist(yes_vec, n)) {
+		if ((yes_dist = double_vector_to_dist(yes_vec, n))) {
 			compact_y = true;
 			delete[] yes_vec; yes_vec = NULL;
 		}

prism/src/hybrid/PH_PSOR.cc

@@ -180,7 +180,7 @@ jboolean forwards	// forwards or backwards?
 	// try and convert to compact form if required
 	compact_d = false;
 	if (compact) {
-		if (diags_dist = double_vector_to_dist(diags_vec, n)) {
+		if ((diags_dist = double_vector_to_dist(diags_vec, n))) {
 			compact_d = true;
 			delete[] diags_vec; diags_vec = NULL;
 		}
@@ -204,7 +204,7 @@ jboolean forwards	// forwards or backwards?
 		// try and convert to compact form if required
 		compact_b = false;
 		if (compact) {
-			if (b_dist = double_vector_to_dist(b_vec, n)) {
+			if ((b_dist = double_vector_to_dist(b_vec, n))) {
 				compact_b = true;
 				delete[] b_vec; b_vec = NULL;
 			}

prism/src/hybrid/PH_Power.cc

@@ -142,7 +142,7 @@ jboolean transpose	// transpose A? (i.e. solve xA=x not Ax=x?)
 		// try and convert to compact form if required
 		compact_b = false;
 		if (compact) {
-			if (b_dist = double_vector_to_dist(b_vec, n)) {
+			if ((b_dist = double_vector_to_dist(b_vec, n))) {
 				compact_b = true;
 				delete[] b_vec; b_vec = NULL;
 			}

prism/src/hybrid/PH_ProbBoundedUntil.cc

@@ -141,7 +141,7 @@ jint bound		// time bound
 	compact_y = false;
 	// try and convert to compact form if required
 	if (compact) {
-		if (yes_dist = double_vector_to_dist(yes_vec, n)) {
+		if ((yes_dist = double_vector_to_dist(yes_vec, n))) {
 			compact_y = true;
 			delete[] yes_vec; yes_vec = NULL;
 		}

prism/src/hybrid/PH_ProbCumulReward.cc

@@ -145,7 +145,7 @@ jint bound			// time bound
 	// try and convert to compact form if required
 	compact_r = false;
 	if (compact) {
-		if (rew_dist = double_vector_to_dist(rew_vec, n)) {
+		if ((rew_dist = double_vector_to_dist(rew_vec, n))) {
 			compact_r = true;
 			delete[] rew_vec; rew_vec = NULL;
 		}

prism/src/hybrid/PH_SOR.cc

@@ -188,7 +188,7 @@ jboolean fwds		// forwards or backwards?
 	// try and convert to compact form if required
 	compact_d = false;
 	if (compact) {
-		if (diags_dist = double_vector_to_dist(diags_vec, n)) {
+		if ((diags_dist = double_vector_to_dist(diags_vec, n))) {
 			compact_d = true;
 			delete[] diags_vec; diags_vec = NULL;
 		}
@@ -212,7 +212,7 @@ jboolean fwds		// forwards or backwards?
 		// try and convert to compact form if required
 		compact_b = false;
 		if (compact) {
-			if (b_dist = double_vector_to_dist(b_vec, n)) {
+			if ((b_dist = double_vector_to_dist(b_vec, n))) {
 				compact_b = true;
 				delete[] b_vec; b_vec = NULL;
 			}

prism/src/hybrid/PH_StochBoundedUntil.cc

@@ -151,7 +151,7 @@ jlong __jlongpointer mu	// probs for multiplying
 	compact_d = false;
 	// try and convert to compact form if required
 	if (compact) {
-		if (diags_dist = double_vector_to_dist(diags, n)) {
+		if ((diags_dist = double_vector_to_dist(diags, n))) {
 			compact_d = true;
 			delete[] diags; diags = NULL;
 		}

prism/src/hybrid/PH_StochCumulReward.cc

@@ -141,7 +141,7 @@ jdouble time		// time bound
 	compact_d = false;
 	// try and convert to compact form if required
 	if (compact) {
-		if (diags_dist = double_vector_to_dist(diags, n)) {
+		if ((diags_dist = double_vector_to_dist(diags, n))) {
 			compact_d = true;
 			delete[] diags; diags = NULL;
 		}

prism/src/hybrid/PH_StochTransient.cc

@@ -137,7 +137,7 @@ jdouble time		// time bound
 	compact_d = false;
 	// try and convert to compact form if required
 	if (compact) {
-		if (diags_dist = double_vector_to_dist(diags, n)) {
+		if ((diags_dist = double_vector_to_dist(diags, n))) {
 			compact_d = true;
 			delete[] diags; diags = NULL;
 		}

prism/src/hybrid/hybrid.cc

@@ -154,7 +154,7 @@ HDDBlocks::~HDDBlocks()
 {
 	if (blocks) delete blocks;
 	if (rowscols) delete rowscols;
-	if (counts) if (use_counts) delete counts; else delete (int*)counts;
+	if (counts) { if (use_counts) delete counts; else delete (int*)counts; }
 	if (offsets) delete offsets;
 }
 

prism/src/jdd/JDD.cc

@@ -508,7 +508,7 @@ JNIEXPORT void JNICALL Java_jdd_JDD_DD_1PrintSupportNames(JNIEnv *env, jclass cl
 	}
 	// Otherwise, need to convert Java array to C array first
 	else {
-		int i, j;
+		int i;
 		jint size;
 		jclass vn_cls;
 		jmethodID vn_mid;
@@ -668,7 +668,7 @@ JNIEXPORT void JNICALL Java_jdd_JDD_DD_1ExportDDToDotFile(JNIEnv *env, jclass cl
 
 JNIEXPORT void JNICALL Java_jdd_JDD_DD_1ExportDDToDotFileLabelled(JNIEnv *env, jclass cls, jlong __jlongpointer dd, jstring filename, jobject var_names)
 {
-	int i, j;
+	int i;
 	jint size;
 	jclass vn_cls;
 	jmethodID vn_mid;

prism/src/odd/odd.cc

@@ -66,7 +66,6 @@ ODDNode *build_odd(DdManager *ddman, DdNode *dd, DdNode **vars, int num_vars)
 
 static ODDNode *build_odd_rec(DdManager *ddman, DdNode *dd, int level, DdNode **vars, int num_vars, ODDNode **tables)
 {
-	int i;
 	ODDNode *ptr;
 	
 	// see if we already have odd in the tables

prism/src/sparse/PS_JOR.cc

@@ -150,7 +150,7 @@ jdouble omega		// omega (over-relaxation parameter)
 	// try and convert to compact form if required
 	compact_d = false;
 	if (compact) {
-		if (diags_dist = double_vector_to_dist(diags_vec, n)) {
+		if ((diags_dist = double_vector_to_dist(diags_vec, n))) {
 			compact_d = true;
 			delete diags_vec; diags_vec = NULL;
 		}
@@ -174,7 +174,7 @@ jdouble omega		// omega (over-relaxation parameter)
 		// try and convert to compact form if required
 		compact_b = false;
 		if (compact) {
-			if (b_dist = double_vector_to_dist(b_vec, n)) {
+			if ((b_dist = double_vector_to_dist(b_vec, n))) {
 				compact_b = true;
 				delete b_vec; b_vec = NULL;
 			}

prism/src/sparse/PS_NondetInstReward.cc

@@ -161,9 +161,9 @@ jlong __jlongpointer in
 				}
 				// see if this value is the min/max so far
 				if (min) {
-					if (first | d2 < d1) d1 = d2;
+					if (first | (d2 < d1)) d1 = d2;
 				} else {
-					if (first | d2 > d1) d1 = d2;
+					if (first | (d2 > d1)) d1 = d2;
 				}
 				first = false;
 			}

prism/src/sparse/PS_NondetReachReward.cc

@@ -241,7 +241,7 @@ jboolean min		// min or max probabilities (true = min, false = max)
 					d2 += non_zeros[k] * soln[cols[k]];
 				}
 				// see if this value is the min/max so far
-				if (first || min&&(d2<d1) || !min&&(d2>d1)) {
+				if (first || (min&&(d2<d1)) || (!min&&(d2>d1))) {
 					d1 = d2;
 					if (adv_loop) { adv_l = l2; adv_h = h2; }
 				}

prism/src/sparse/PS_NondetUntil.cc

@@ -209,7 +209,7 @@ jboolean min				// min or max probabilities (true = min, false = max)
 				for (k = l2; k < h2; k++) {
 					d2 += non_zeros[k] * soln[cols[k]];
 				}
-				if (first || min&&(d2<d1) || !min&&(d2>d1)) {
+				if (first || (min&&(d2<d1)) || (!min&&(d2>d1))) {
 					d1 = d2;
 					if (adv_loop) { adv_l = l2; adv_h = h2; }
 				}

prism/src/sparse/PS_Power.cc

@@ -126,7 +126,7 @@ jboolean transpose	// transpose A? (i.e. solve xA=x not Ax=x?)
 		// try and convert to compact form if required
 		compact_b = false;
 		if (compact) {
-			if (b_dist = double_vector_to_dist(b_vec, n)) {
+			if ((b_dist = double_vector_to_dist(b_vec, n))) {
 				compact_b = true;
 				delete b_vec; b_vec = NULL;
 			}

prism/src/sparse/PS_ProbBoundedUntil.cc

@@ -124,7 +124,7 @@ jint bound		// time bound
 	// try and convert to compact form if required
 	compact_y = false;
 	if (compact) {
-		if (yes_dist = double_vector_to_dist(yes_vec, n)) {
+		if ((yes_dist = double_vector_to_dist(yes_vec, n))) {
 			compact_y = true;
 			delete[] yes_vec; yes_vec = NULL;
 		}

prism/src/sparse/PS_ProbCumulReward.cc

@@ -128,7 +128,7 @@ jint bound			// time bound
 	// try and convert to compact form if required
 	compact_r = false;
 	if (compact) {
-		if (rew_dist = double_vector_to_dist(rew_vec, n)) {
+		if ((rew_dist = double_vector_to_dist(rew_vec, n))) {
 			compact_r = true;
 			delete[] rew_vec; rew_vec = NULL;
 		}

prism/src/sparse/PS_SOR.cc

@@ -151,7 +151,7 @@ jboolean forwards	// forwards or backwards?
 	// try and convert to compact form if required
 	compact_d = false;
 	if (compact) {
-		if (diags_dist = double_vector_to_dist(diags_vec, n)) {
+		if ((diags_dist = double_vector_to_dist(diags_vec, n))) {
 			compact_d = true;
 			delete diags_vec; diags_vec = NULL;
 		}
@@ -175,7 +175,7 @@ jboolean forwards	// forwards or backwards?
 		// try and convert to compact form if required
 		compact_b = false;
 		if (compact) {
-			if (b_dist = double_vector_to_dist(b_vec, n)) {
+			if ((b_dist = double_vector_to_dist(b_vec, n))) {
 				compact_b = true;
 				delete b_vec; b_vec = NULL;
 			}

prism/src/sparse/PS_StochBoundedUntil.cc

@@ -134,7 +134,7 @@ jlong __jlongpointer mu	// probs for multiplying
 	// try and convert to compact form if required
 	compact_d = false;
 	if (compact) {
-		if (diags_dist = double_vector_to_dist(diags, n)) {
+		if ((diags_dist = double_vector_to_dist(diags, n))) {
 			compact_d = true;
 			delete diags; diags = NULL;
 		}

prism/src/sparse/PS_StochCumulReward.cc

@@ -123,7 +123,7 @@ jdouble time		// time bound
 	// try and convert to compact form if required
 	compact_d = false;
 	if (compact) {
-		if (diags_dist = double_vector_to_dist(diags, n)) {
+		if ((diags_dist = double_vector_to_dist(diags, n))) {
 			compact_d = true;
 			delete diags; diags = NULL;
 		}

prism/src/sparse/PS_StochTransient.cc

@@ -119,7 +119,7 @@ jdouble time		// time bound
 	// try and convert to compact form if required
 	compact_d = false;
 	if (compact) {
-		if (diags_dist = double_vector_to_dist(diags, n)) {
+		if ((diags_dist = double_vector_to_dist(diags, n))) {
 			compact_d = true;
 			delete diags; diags = NULL;
 		}