s14h
/
prism-accumulation
1
0
Fork 0
Code Releases Activity
Browse Source

Win64 cleanup, PS_NondetMulti*: avoid pointer-to-integer casts 

Here, the casts are not needed, we can simply declare the correct pointer types.


git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12013 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Joachim Klein 9 years ago
parent
ce917c0248
commit
4c134da06d
4 changed files with 40 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      prism/src/sparse/PS_NondetMultiReach.cc
  2. 20
      prism/src/sparse/PS_NondetMultiReach1.cc
  3. 20
      prism/src/sparse/PS_NondetMultiReachReward.cc
  4. 20
      prism/src/sparse/PS_NondetMultiReachReward1.cc

20
prism/src/sparse/PS_NondetMultiReach.cc
View File

@ -343,19 +343,19 @@ JNIEXPORT jdouble __jlongpointer JNICALL Java_sparse_PrismSparse_PS_1NondetMulti
int *constraints_sp;
int *constraints_ints;
double *constraints_reals;
unsigned long *constraints_int_ptr;
unsigned long *constraints_real_ptr;
int **constraints_int_ptr;
double **constraints_real_ptr;
constraints_sp = new int[n];
constraints_int_ptr = new unsigned long[n];
constraints_real_ptr = new unsigned long[n];
constraints_int_ptr = new int*[n];
constraints_real_ptr = new double*[n];
for(i=0; i<n; i++)
if(maybe_vec[i]> 0 || yes_vec[i]> 0) {
//printf("i = %1d, ", i);
constraints_ints = new int[arr_ints[i]];
constraints_reals = new REAL[arr_ints[i]];
constraints_sp[i] = map_var[i+1]-map_var[i];
constraints_int_ptr[i] = (unsigned long)constraints_ints;
constraints_real_ptr[i] = (unsigned long)constraints_reals;
constraints_int_ptr[i] = constraints_ints;
constraints_real_ptr[i] = constraints_reals;
for(j=0; j<map_var[i+1]-map_var[i]; j++) {
constraints_ints[j] = map_var[i] + j + 1; // index starts at 1 in lp_solve
constraints_reals[j] = 1.0;
@ -399,8 +399,8 @@ JNIEXPORT jdouble __jlongpointer JNICALL Java_sparse_PrismSparse_PS_1NondetMulti
// get the index of the corresponding variable
i = cols[k];
if(maybe_vec[i]> 0 || yes_vec[i]> 0) {
constraints_ints = (int *)constraints_int_ptr[i];
constraints_reals = (double *)constraints_real_ptr[i];
constraints_ints = constraints_int_ptr[i];
constraints_reals = constraints_real_ptr[i];
for(k_r=0; k_r<constraints_sp[i]; k_r++)
if(constraints_ints[k_r]==map_var[x]+j-l1-count+1)
break;
@ -434,8 +434,8 @@ JNIEXPORT jdouble __jlongpointer JNICALL Java_sparse_PrismSparse_PS_1NondetMulti
for (i = 0; i < n; i++)
if (maybe_vec[i]> 0 || yes_vec[i]> 0) {
constraints_ints = (int *)constraints_int_ptr[i];
constraints_reals = (double *)constraints_real_ptr[i];
constraints_ints = constraints_int_ptr[i];
constraints_reals = constraints_real_ptr[i];
add_constraintex(lp, constraints_sp[i], constraints_reals, constraints_ints, EQ, (start_index==i ? 1.0 : 0.0));
delete[] constraints_ints;
delete[] constraints_reals;

20
prism/src/sparse/PS_NondetMultiReach1.cc
View File

@ -380,19 +380,19 @@ JNIEXPORT jdouble __jlongpointer JNICALL Java_sparse_PrismSparse_PS_1NondetMulti
int *constraints_sp;
int *constraints_ints;
double *constraints_reals;
unsigned long *constraints_int_ptr;
unsigned long *constraints_real_ptr;
int **constraints_int_ptr;
double **constraints_real_ptr;
constraints_sp = new int[n];
constraints_int_ptr = new unsigned long[n];
constraints_real_ptr = new unsigned long[n];
constraints_int_ptr = new int*[n];
constraints_real_ptr = new double*[n];
for(i=0; i<n; i++)
if(maybe_vec[i]> 0 || yes_vec[i]> 0) {
//printf("i = %1d, ", i);
constraints_ints = new int[arr_ints[i]];
constraints_reals = new REAL[arr_ints[i]];
constraints_sp[i] = map_var[i+1]-map_var[i];
constraints_int_ptr[i] = (unsigned long)constraints_ints;
constraints_real_ptr[i] = (unsigned long)constraints_reals;
constraints_int_ptr[i] = constraints_ints;
constraints_real_ptr[i] = constraints_reals;
for(j=0; j<map_var[i+1]-map_var[i]; j++) {
constraints_ints[j] = map_var[i] + j + 1; // index starts at 1 in lp_solve
constraints_reals[j] = 1.0;
@ -436,8 +436,8 @@ JNIEXPORT jdouble __jlongpointer JNICALL Java_sparse_PrismSparse_PS_1NondetMulti
// get the index of the corresponding variable
i = cols[k];
if(maybe_vec[i]> 0 || yes_vec[i]> 0) {
constraints_ints = (int *)constraints_int_ptr[i];
constraints_reals = (double *)constraints_real_ptr[i];
constraints_ints = constraints_int_ptr[i];
constraints_reals = constraints_real_ptr[i];
for(k_r=0; k_r<constraints_sp[i]; k_r++)
if(constraints_ints[k_r]==map_var[x]+j-l1-count+1)
break;
@ -471,8 +471,8 @@ JNIEXPORT jdouble __jlongpointer JNICALL Java_sparse_PrismSparse_PS_1NondetMulti
for (i = 0; i < n; i++)
if (maybe_vec[i]> 0 || yes_vec[i]> 0) {
constraints_ints = (int *)constraints_int_ptr[i];
constraints_reals = (double *)constraints_real_ptr[i];
constraints_ints = constraints_int_ptr[i];
constraints_reals = constraints_real_ptr[i];
add_constraintex(lp, constraints_sp[i], constraints_reals, constraints_ints, EQ, (start_index==i ? 1.0 : 0.0));
delete[] constraints_ints;
delete[] constraints_reals;

20
prism/src/sparse/PS_NondetMultiReachReward.cc
View File

@ -389,18 +389,18 @@ JNIEXPORT jdouble __jlongpointer JNICALL Java_sparse_PrismSparse_PS_1NondetMulti
int *constraints_sp;
int *constraints_ints;
double *constraints_reals;
unsigned long *constraints_int_ptr;
unsigned long *constraints_real_ptr;
int **constraints_int_ptr;
double **constraints_real_ptr;
constraints_sp = new int[n];
constraints_int_ptr = new unsigned long[n];
constraints_real_ptr = new unsigned long[n];
constraints_int_ptr = new int*[n];
constraints_real_ptr = new double*[n];
for(i=0; i<n; i++)
if(maybe_vec[i]> 0 || yes_vec[i]> 0) {
constraints_ints = new int[arr_ints[i]];
constraints_reals = new REAL[arr_ints[i]];
constraints_sp[i] = map_var[i+1]-map_var[i];
constraints_int_ptr[i] = (unsigned long)constraints_ints;
constraints_real_ptr[i] = (unsigned long)constraints_reals;
constraints_int_ptr[i] = constraints_ints;
constraints_real_ptr[i] = constraints_reals;
for(j=0; j<map_var[i+1]-map_var[i]; j++) {
constraints_ints[j] = map_var[i] + j + 1;
constraints_reals[j] = 1.0;
@ -445,8 +445,8 @@ JNIEXPORT jdouble __jlongpointer JNICALL Java_sparse_PrismSparse_PS_1NondetMulti
// get the index of the corresponding variable
i = cols[k];
if(maybe_vec[i]> 0 || yes_vec[i]> 0) {
constraints_ints = (int *)constraints_int_ptr[i];
constraints_reals = (double *)constraints_real_ptr[i];
constraints_ints = constraints_int_ptr[i];
constraints_reals = constraints_real_ptr[i];
for(k_r=0; k_r<constraints_sp[i]; k_r++)
if(constraints_ints[k_r]==map_var[x]+j-l1-count + 1)
break;
@ -480,8 +480,8 @@ JNIEXPORT jdouble __jlongpointer JNICALL Java_sparse_PrismSparse_PS_1NondetMulti
for (i = 0; i < n; i++)
if (maybe_vec[i]> 0 || yes_vec[i]> 0) {
constraints_ints = (int *)constraints_int_ptr[i];
constraints_reals = (double *)constraints_real_ptr[i];
constraints_ints = constraints_int_ptr[i];
constraints_reals = constraints_real_ptr[i];
add_constraintex(lp, constraints_sp[i], constraints_reals, constraints_ints, EQ, (start_index==i ? 1.0 : 0.0));
delete[] constraints_ints;
delete[] constraints_reals;

20
prism/src/sparse/PS_NondetMultiReachReward1.cc
View File

@ -426,18 +426,18 @@ JNIEXPORT jdouble __jlongpointer JNICALL Java_sparse_PrismSparse_PS_1NondetMulti
int *constraints_sp;
int *constraints_ints;
double *constraints_reals;
unsigned long *constraints_int_ptr;
unsigned long *constraints_real_ptr;
int **constraints_int_ptr;
double **constraints_real_ptr;
constraints_sp = new int[n];
constraints_int_ptr = new unsigned long[n];
constraints_real_ptr = new unsigned long[n];
constraints_int_ptr = new int*[n];
constraints_real_ptr = new double*[n];
for(i=0; i<n; i++)
if(maybe_vec[i]> 0 || yes_vec[i]> 0) {
constraints_ints = new int[arr_ints[i]];
constraints_reals = new REAL[arr_ints[i]];
constraints_sp[i] = map_var[i+1]-map_var[i];
constraints_int_ptr[i] = (unsigned long)constraints_ints;
constraints_real_ptr[i] = (unsigned long)constraints_reals;
constraints_int_ptr[i] = constraints_ints;
constraints_real_ptr[i] = constraints_reals;
for(j=0; j<map_var[i+1]-map_var[i]; j++) {
constraints_ints[j] = map_var[i] + j + 1;
constraints_reals[j] = 1.0;
@ -481,8 +481,8 @@ JNIEXPORT jdouble __jlongpointer JNICALL Java_sparse_PrismSparse_PS_1NondetMulti
// get the index of the corresponding variable
i = cols[k];
if(maybe_vec[i]> 0 || yes_vec[i]> 0) {
constraints_ints = (int *)constraints_int_ptr[i];
constraints_reals = (double *)constraints_real_ptr[i];
constraints_ints = constraints_int_ptr[i];
constraints_reals = constraints_real_ptr[i];
for(k_r=0; k_r<constraints_sp[i]; k_r++)
if(constraints_ints[k_r]==map_var[x]+j-l1-count + 1)
break;
@ -516,8 +516,8 @@ JNIEXPORT jdouble __jlongpointer JNICALL Java_sparse_PrismSparse_PS_1NondetMulti
for (i = 0; i < n; i++)
if (maybe_vec[i]> 0 || yes_vec[i]> 0) {
constraints_ints = (int *)constraints_int_ptr[i];
constraints_reals = (double *)constraints_real_ptr[i];
constraints_ints = constraints_int_ptr[i];
constraints_reals = constraints_real_ptr[i];
add_constraintex(lp, constraints_sp[i], constraints_reals, constraints_ints, EQ, (start_index==i ? 1.0 : 0.0));
delete[] constraints_ints;
delete[] constraints_reals;

Write Preview
Loading…
Cancel
Save