diff --git a/NN/volume.c b/NN/volume.c index 06994a8c8481d07818f748b53aad46968abfb9b1..d83ab6bcdb9269e05b49cbedc0556b15cc08b508 100644 --- a/NN/volume.c +++ b/NN/volume.c @@ -166,8 +166,8 @@ for (i=0;i<mm;i++) /* allocate memory */ - ap = (float *) malloc((sizeof *a)*nm1*mm1); - bp = (float *) malloc((sizeof *b)*mm1); + ap = (float *) malloc((sizeof (float))*nm1*mm1); + bp = (float *) malloc((sizeof (float))*mm1); /* reduce a and b into ap and bp eliminating variable t and constraint i */ @@ -376,8 +376,8 @@ for (i=0;i<mm;i++) /* allocate memory */ - ap = (float *) malloc(4*nm1*mm1); - bp = (float *) malloc(4*mm1); + ap = (float *) malloc((sizeof (float))*nm1*mm1); + bp = (float *) malloc((sizeof (float))*mm1); /* reduce a and b into ap and bp eliminating variable t and constraint i */ @@ -622,8 +622,8 @@ v=0.; /* allocate memory */ - ap = (float *) malloc(4*nm1*mm1); - bp = (float *) malloc(4*mm1); + ap = (float *) malloc((sizeof (float))*nm1*mm1); + bp = (float *) malloc((sizeof (float))*mm1); /* reduce a and b into ap and bp eliminating variable t and constraint i */ @@ -899,7 +899,7 @@ for (i=0;i<mm;i++) if (special == 0) { - ttemp = (float *) malloc(4*mm1); + ttemp = (float *) malloc((sizeof (float))*mm1); for (j=0;j<mm1;j++) *(ttemp+j) = - *(a+j+1+tmm)/pivot; kval = 1; } @@ -915,7 +915,7 @@ for (i=0;i<mm;i++) if(special == 0) { - ttemp = (float *) malloc(4*mm1); + ttemp = (float *) malloc((sizeof (float))*mm1); for (j=0;j<i;j++) *(ttemp+j) = *(temp+j) -(*(temp+i) * *(a+j+tmm)/pivot); for (j=i;j<mm1;j++) *(ttemp+j) = *(temp+j+1) @@ -931,8 +931,8 @@ for (i=0;i<mm;i++) /* allocate memory */ - ap = (float *) malloc(4*nm1*mm1); - bp = (float *) malloc(4*mm1); + ap = (float *) malloc((sizeof (float))*nm1*mm1); + bp = (float *) malloc((sizeof (float))*mm1); /* reduce a and b into ap and bp eliminating variable t and constraint i */ @@ -1218,8 +1218,8 @@ for (i=0;i<mm;i++) /* allocate memory */ - ap = (float *) malloc(4*nm1*mm1); - bp = (float *) malloc(4*mm1); + ap = (float *) malloc((sizeof (float))*nm1*mm1); + bp = (float *) malloc((sizeof (float))*mm1); /* reduce a and b into ap and bp eliminating variable t and constraint i */ @@ -1487,7 +1487,7 @@ for (i=0;i<mm;i++) if (special == 0) { - ttemp = (float *) malloc(4*mm1); + ttemp = (float *) malloc((sizeof (float))*mm1); for (j=0;j<mm1;j++) *(ttemp+j) = - *(a+j+1+tmm)/pivot; kval = 1; } @@ -1503,7 +1503,7 @@ for (i=0;i<mm;i++) if(special == 0) { - ttemp = (float *) malloc(4*mm1); + ttemp = (float *) malloc((sizeof (float))*mm1); for (j=0;j<i;j++) *(ttemp+j) = *(temp+j) -(*(temp+i) * *(a+j+tmm)/pivot); for (j=i;j<mm1;j++) *(ttemp+j) = *(temp+j+1) @@ -1519,8 +1519,8 @@ for (i=0;i<mm;i++) /* allocate memory */ - ap = (float *) malloc(4*nm1*mm1); - bp = (float *) malloc(4*mm1); + ap = (float *) malloc((sizeof (float))*nm1*mm1); + bp = (float *) malloc((sizeof (float))*mm1); /* reduce a and b into ap and bp eliminating variable t and constraint i */ @@ -1906,7 +1906,7 @@ for (i=0;i<mm;i++) if (special == 0) { - ttemp = (float *) malloc(4*mm); + ttemp = (float *) malloc((sizeof (float))*mm); for (j=0;j<mm1;j++) *(ttemp+j) = - *(a+j+1+tmm)/pivot; kval = 1; printf("\n Generating temp n = %d m = %d i = %d \n",nn,mm,i); @@ -1926,7 +1926,7 @@ for (i=0;i<mm;i++) if(special == 0) { - ttemp = (float *) malloc(4*mm1); + ttemp = (float *) malloc((sizeof (float))*mm1); for (j=0;j<i;j++) *(ttemp+j) = *(temp+j) -(*(temp+i) * *(a+j+tmm)/pivot); for (j=i;j<mm1;j++) *(ttemp+j) = *(temp+j+1) @@ -1945,8 +1945,8 @@ for (i=0;i<mm;i++) /* allocate memory */ - ap = (float *) malloc(4*nm1*mm1); - bp = (float *) malloc(4*mm1); + ap = (float *) malloc((sizeof (float))*nm1*mm1); + bp = (float *) malloc((sizeof (float))*mm1); /* reduce a and b into ap and bp eliminating variable t and constraint i */ @@ -1998,7 +1998,7 @@ for (i=0;i<mm;i++) for (j=1;j<mm;j++) { k = j - 1; - junk=cvolumebj(ap,bp,&mm1,&nm1,k,&dvdb); + junk=cvolumebj(ap,bp,&mm1,&nm1,&mm1,&nm1,k,&dvdb); if(junk == -1.) { *code = -1; @@ -2161,7 +2161,7 @@ for (i=0;i<mm;i++) deriv = 0.; for (j=0;j<i;j++) { - junk=cvolumebj(ap,bp,&mm1,&nm1,j,&dvdb); + junk=cvolumebj(ap,bp,&mm1,&nm1,&mm1,&nm1,j,&dvdb); if(junk == -1.) { *code = -1; @@ -2174,7 +2174,7 @@ for (i=0;i<mm;i++) for (j=i+1;j<mm;j++) { k = j - 1; - junk=cvolumebj(ap,bp,&mm1,&nm1,k,&dvdb); + junk=cvolumebj(ap,bp,&mm1,&nm1,&mm1,&nm1,k,&dvdb); if(junk == -1.) { *code = -1;