1 files changed, 47 insertions, 45 deletions

diff --git a/dis/Transitive/transitive.c b/dis/Transitive/transitive.c
index 5fa52e8..303216f 100644
--- a/dis/Transitive/transitive.c
+++ b/dis/Transitive/transitive.c
@@ -45,20 +45,21 @@ int main(int argc, char** argv){
   unsigned int i, j, k;
   int seed;
 
-  time_t startTime;
+  time_t startTime, stopTime;
   unsigned int sum;
-   
-  fscanf(stdin,"%d %d %d", &n, &m, &seed);
+  volatile int realRes = 0;
+
+  assert(fscanf(stdin,"%d %d %d", &n, &m, &seed) == 3);
 
   assert((n >= MIN_VERTICES) && (n <= MAX_VERTICES));
   assert((m >= MIN_EDGES) && (m <= MAX_EDGES));
-  assert (m <= n*n);
-  assert ((seed >= MIN_SEED) && (seed <= MAX_SEED));
+  assert(m <= n*n);
+  assert((seed >= MIN_SEED) && (seed <= MAX_SEED));
 
  if ((din = (unsigned int *)malloc(n*n*sizeof(unsigned int))) == NULL)
-    return (-1);
+   return (-1);
  if ((dout = (unsigned int *)malloc(n*n*sizeof(unsigned int))) == NULL)
-    return (-1);
+   return (-1);
 
  for (i=0; i<n*n; i++){
    *(din + i) = NO_PATH;
@@ -75,53 +76,54 @@ int main(int argc, char** argv){
   SET_UP
   startTime = time(NULL);
 
+  START_LOOP
   for (k=0; k<n; k++){
-  unsigned int old;
-  unsigned int new1;
-  unsigned int *dtemp;
-    START_LOOP
-    
+    unsigned int old;
+    unsigned int new1;
+    unsigned int *dtemp;
+
     for (i=0; i<n; i++){
       for (j=0; j<n; j++){
-        old = *(din + j*n + i);
-        new1 = *(din + j*n + k) + *(din + k*n + i);
-        *(dout + j*n + i) = (new1 < old ? new1: old);
-        assert (*(dout + j*n + i) <= NO_PATH);
-        assert (*(dout + j*n + i) <= *(din + j*n + i));
+        old = *(din + j*n + i);
+        new1 = *(din + j*n + k) + *(din + k*n + i);
+        *(dout + j*n + i) = (new1 < old ? new1: old);
+        assert(*(dout + j*n + i) <= NO_PATH);
+        assert(*(dout + j*n + i) <= *(din + j*n + i));
       }
     }
-      dtemp = dout;
-      dout = din;
-      din = dtemp;
-      STOP_LOOP
-    }
+    dtemp = dout;
+    dout = din;
+    din = dtemp;
+  }
 
-    startTime = time(NULL) - startTime;
-    
-    for (j=0; j<n; j++){
-      sum = 0;
-      for (i=0; i<n; i++){
-        if (*(din + j*n + i) != NO_PATH)
-          sum += *(din + j*n + i);
-      }
-    fprintf(stdout, "%u\n", sum);
-    }
+  STOP_LOOP
+  stopTime = time(NULL);
+
+  for (j=0; j<n; j++){
+    sum = 0;
     for (i=0; i<n; i++){
-      sum = 0;
-      for (j=0; j<n; j++){
-        if (*(din + j*n + i) != NO_PATH)
-            sum += *(din+j*n+i);
-      }
-      
-      fprintf(stdout, "%u\n", sum);
+      if (*(din + j*n + i) != NO_PATH)
+        sum += *(din + j*n + i);
     }
-
-    fprintf(stdout, " total time = %u seconds. \n", (unsigned int)startTime);
-    free(din);
-    free(dout);
-    WRITE_TO_FILE
-    return(0);
+    realRes+=sum;
+    //fprintf(stdout, "%u ", sum);
+  }
+  for (i=0; i<n; i++){
+    sum = 0;
+    for (j=0; j<n; j++){
+      if (*(din + j*n + i) != NO_PATH)
+        sum += *(din+j*n+i);
+    }
+    realRes+=sum;
+    //fprintf(stdout, "%u ", sum);
   }
+  fprintf(stderr, "time for transitive stressmark = %f seconds.\n",
+            difftime(stopTime, startTime));
+  free(din);
+  free(dout);
+  WRITE_TO_FILE
+  return(0);
+}