8 files changed, 560 insertions, 230 deletions

diff --git a/dis/Field/field.c b/dis/Field/field.c
index 8565e8c..f83a403 100644
--- a/dis/Field/field.c
+++ b/dis/Field/field.c
@@ -47,7 +47,7 @@ int main(int argc, char** argv){
   int mod_offset;
   unsigned int n;
 
-  time_t startTime;
+  time_t startTime, endTime;
  
   struct tokenS{
   unsigned char delimiter[MAX_TOKEN_LENGTH];
@@ -92,9 +92,9 @@ int main(int argc, char** argv){
   }
   
   startTime = time(NULL);
-  
+  START_LOOP
+
   for (l =0; l<n; l++){
-    START_LOOP
     unsigned int index;
     
     token[l].subfields = 0;
@@ -133,20 +133,25 @@ int main(int argc, char** argv){
         index++;
     }
     token[l].subfields++;
-    STOP_LOOP
     }
 
-    startTime = time(NULL) - startTime;
+    STOP_LOOP
+    endTime = time(NULL);
 
+    volatile int sumAll = 0;
     for (l = 0; l< n; l++){
       unsigned int ll;
-      fprintf(stdout, "%d subfields for token %d \n", token[l].subfields, l);
-      for ( ll =0; ll<token[l].subfields; ll++)
-        fprintf(stdout, "subfields %d:\tcount = %d\tmin= %x\tsum= %x\n",
-                ll, token[l].stat[ll].count, 
-                token[l].stat[ll].min, token[l].stat[ll].sum);
+      //fprintf(stdout, "%d subfields for token %d \n", token[l].subfields, l);
+      sumAll += token[l].subfields + l;
+      for ( ll =0; ll<token[l].subfields; ll++) {
+        sumAll += ll + token[l].stat[ll].count + token[l].stat[ll].min + token[l].stat[ll].sum;
+        /*fprintf(stdout, "subfields %d:\tcount = %d\tmin= %x\tsum= %x\n",
+            ll, token[l].stat[ll].count, 
+            token[l].stat[ll].min, token[l].stat[ll].sum);*/
+      }
     }
-    fprintf(stdout, "total time = %d seconds.\n", (int)startTime);
+    fprintf(stderr, "time for field stressmark = %f seconds.\n",
+            difftime(endTime, startTime));
     free(field);
     WRITE_TO_FILE
     return(0);
diff --git a/dis/Matrix/ver2/matrix.c b/dis/Matrix/ver2/matrix.c
index 957d7c5..ffa7cb7 100755
--- a/dis/Matrix/ver2/matrix.c
+++ b/dis/Matrix/ver2/matrix.c
@@ -48,7 +48,7 @@
 #define MIN_DIM  1
 #define MAX_DIM  32768
 #define MAX_ITERATIONS 65536
-#define MIN_TOLERANCE 0.000007
+#define MIN_TOLERANCE 1e-7//0.000007
 #define MAX_TOLERANCE 0.5
 #define MIN_NUMBER   -3.4e10/dim
 #define MAX_NUMBER 3.4e10/dim
@@ -61,8 +61,6 @@
  */
 
 static int dim;
-int argc;
-char** argv;
 
 /*      
  *  matrix * vector     
@@ -312,7 +310,14 @@ void biConjugateGradient(double *value,
                          int maxIterations,
                          double *actualError,
                          int *actualIteration,
-                         int dim)
+                         int dim,
+                         // Start internal matrixes
+                         double *vectorP,
+                         double *vectorR,
+                         double *nextVectorR,
+                         double *tmpVector1,
+                         double *tmpVector2,
+                         double *tmpVector3)
      /* 
       * in the code, we use a lot of temparary vectors and variables
       * this is just for simple and clear
@@ -321,31 +326,18 @@ void biConjugateGradient(double *value,
       *
       */
 {
-  double *vectorR;
-  double *vectorP, *matrixAvectorP, *nextVectorR;
   double  error;
   int iteration;
   double  alpha, beta;
 
-  double  *tmpVector1, *tmpVector2, *tmpVector3;
   double   tmpValue1, tmpValue2; 
   int i;
   int l;
   int ll;
-  SET_UP
 
   alpha = 0;
   beta = 0;
 
-  vectorP = (double *)malloc(dim*sizeof(double));
-  vectorR = (double *)malloc(dim*sizeof(double));
-  nextVectorR = (double *)malloc(dim*sizeof(double));
-  vectorX = (double *)malloc(dim*sizeof(double));
-
-  tmpVector1 = (double *)malloc(dim*sizeof(double));
-  tmpVector2 = (double *)malloc(dim*sizeof(double));
-  tmpVector3 = (double *)malloc(dim*sizeof(double));
-
   /*
    * vectorR = vectorB - matrixA*vectorX
    */
@@ -369,7 +361,6 @@ void biConjugateGradient(double *value,
   iteration = 0;
 
   while ((iteration < maxIterations) && (error > errorTolerance)){
-    START_LOOP
    
     /* 
      *   alpha = (transpose(vectorR) * vectorR) /
@@ -434,7 +425,6 @@ void biConjugateGradient(double *value,
     error = vectorValue(tmpVector1)/vectorValue(vectorB);
 
     iteration++;
-    STOP_LOOP
   }
 
   *actualError = error;
@@ -446,7 +436,6 @@ void biConjugateGradient(double *value,
 
   free(vectorR);
   free(vectorP);
-  WRITE_TO_FILE
 
   return;
 }
@@ -515,10 +504,8 @@ void create_CRS(double *matrixA,
 }
 
 
-int main(int _argc, char** _argv)
+int main(int argc, char** argv)
 {
-  argc = _argc;
-  argv = _argv;
   int seed;
   int numberNonzero;
   int maxIterations;
@@ -536,18 +523,22 @@ int main(int _argc, char** _argv)
   double *value;
   int    *col_ind;
   int    *row_start;
-  int sum;
+  double sum;
   int k;
+  // Internal vects for biConj
+  double *vectorR, *vectorP, *nextVectorR;
+  double  *tmpVector1, *tmpVector2, *tmpVector3;
+  SET_UP