From 1120161286ee5c855b630bccc9e0b37bb8a3ee65 Mon Sep 17 00:00:00 2001
From: Joshua Bakita <jbakita@cs.unc.edu>
Date: Sat, 17 Oct 2020 19:07:11 -0400
Subject: Fix DIS coding style by running them all through clang-format

Also fixes a missing header in DISstressmarkRNG.h and the "all"
make target. No functional changes.
---
 dis/Transitive/DISstressmarkRNG.h |   1 +
 dis/Transitive/transitive.c       | 103 ++++++++++++++++++--------------------
 2 files changed, 49 insertions(+), 55 deletions(-)

(limited to 'dis/Transitive')

diff --git a/dis/Transitive/DISstressmarkRNG.h b/dis/Transitive/DISstressmarkRNG.h
index 4aa2620..6243606 100644
--- a/dis/Transitive/DISstressmarkRNG.h
+++ b/dis/Transitive/DISstressmarkRNG.h
@@ -1,3 +1,4 @@
+#include <assert.h>
 #include <math.h>
 
 #define IA 16807
diff --git a/dis/Transitive/transitive.c b/dis/Transitive/transitive.c
index 303216f..51805a6 100644
--- a/dis/Transitive/transitive.c
+++ b/dis/Transitive/transitive.c
@@ -1,12 +1,12 @@
 /*
  *  Sample code for the DIS Transitive Stressmark
  *
- * This source code is the completely correct source code based on 
- * the example codes provided by Atlantic Aerospace Division, Titan 
+ * This source code is the completely correct source code based on
+ * the example codes provided by Atlantic Aerospace Division, Titan
  * Systems Corporation, 2000.
- * 
- * If you just compile and generate the executables from this source 
- * code, this code would be enough. However, if you wish to get a complete 
+ *
+ * If you just compile and generate the executables from this source
+ * code, this code would be enough. However, if you wish to get a complete
  * understanding of this stressmark, it is strongly suggested that you
  * read the Benchmark Analysis and Specifications Document Version 1.0
  * before going on since the detailed comments are given in this documents.
@@ -16,12 +16,12 @@
  * Joshua Bakita, 05/30/2020: Fixed out-of-bounds randInt call
  */
 
-#include <stdio.h>
-#include <time.h>
-#include <assert.h>
-#include <stdlib.h>
 #include "DISstressmarkRNG.h"
 #include "extra.h"
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
 
 #define MIN_VERTICES 8
 #define MAX_VERTICES 16384
@@ -34,11 +34,11 @@
 #define MIN_EDGS 0
 #define MAX_EDGE 255
 
-/* 
+/*
  * main()
  */
 
-int main(int argc, char** argv){
+int main(int argc, char **argv) {
   unsigned int *din, *dout;
   unsigned int n;
   unsigned int m;
@@ -49,46 +49,46 @@ int main(int argc, char** argv){
   unsigned int sum;
   volatile int realRes = 0;
 
-  assert(fscanf(stdin,"%d %d %d", &n, &m, &seed) == 3);
+  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(m <= n * n);
   assert((seed >= MIN_SEED) && (seed <= MAX_SEED));
 
- if ((din = (unsigned int *)malloc(n*n*sizeof(unsigned int))) == NULL)
-   return (-1);
- if ((dout = (unsigned int *)malloc(n*n*sizeof(unsigned int))) == NULL)
-   return (-1);
+  if ((din = (unsigned int *)malloc(n * n * sizeof(unsigned int))) == NULL)
+    return (-1);
+  if ((dout = (unsigned int *)malloc(n * n * sizeof(unsigned int))) == NULL)
+    return (-1);
 
- for (i=0; i<n*n; i++){
-   *(din + i) = NO_PATH;
-   *(dout + i) = NO_PATH;
- }
+  for (i = 0; i < n * n; i++) {
+    *(din + i) = NO_PATH;
+    *(dout + i) = NO_PATH;
+  }
 
   randInit(seed);
-  for (k=0; k<m; k++){
-    i = randInt(0, n-1);
-    j = randInt(0, n-1);
-    *(din + j*n + i) = randInt(MIN_EDGES, MAX_EDGES);
+  for (k = 0; k < m; k++) {
+    i = randInt(0, n - 1);
+    j = randInt(0, n - 1);
+    *(din + j * n + i) = randInt(MIN_EDGES, MAX_EDGES);
   }
-  
+
   SET_UP
   startTime = time(NULL);
 
   START_LOOP
-  for (k=0; k<n; k++){
+  for (k = 0; k < n; k++) {
     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));
+    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));
       }
     }
     dtemp = dout;
@@ -99,35 +99,28 @@ int main(int argc, char** argv){
   STOP_LOOP
   stopTime = time(NULL);
 
-  for (j=0; j<n; j++){
+  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);
+    for (i = 0; i < n; i++) {
+      if (*(din + j * n + i) != NO_PATH)
+        sum += *(din + j * n + i);
     }
-    realRes+=sum;
-    //fprintf(stdout, "%u ", sum);
+    realRes += sum;
+    // fprintf(stdout, "%u ", sum);
   }
-  for (i=0; i<n; i++){
+  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);
+    for (j = 0; j < n; j++) {
+      if (*(din + j * n + i) != NO_PATH)
+        sum += *(din + j * n + i);
     }
-    realRes+=sum;
-    //fprintf(stdout, "%u ", sum);
+    realRes += sum;
+    // fprintf(stdout, "%u ", sum);
   }
   fprintf(stderr, "time for transitive stressmark = %f seconds.\n",
-            difftime(stopTime, startTime));
+          difftime(stopTime, startTime));
   free(din);
   free(dout);
   WRITE_TO_FILE
-  return(0);
+  return (0);
 }
-    
-
-	
-
-    
- 
-  
-- 
cgit v1.2.2