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.

2 files changed, 220 insertions, 249 deletions

diff --git a/dis/Matrix/ver2/DISstressmarkRNG.h b/dis/Matrix/ver2/DISstressmarkRNG.h
index 4aa2620..6243606 100755
--- a/dis/Matrix/ver2/DISstressmarkRNG.h
+++ b/dis/Matrix/ver2/DISstressmarkRNG.h
@@ -1,3 +1,4 @@
+#include <assert.h>
 #include <math.h>
 
 #define IA 16807
diff --git a/dis/Matrix/ver2/matrix.c b/dis/Matrix/ver2/matrix.c
index ffa7cb7..2b075fb 100755
--- a/dis/Matrix/ver2/matrix.c
+++ b/dis/Matrix/ver2/matrix.c
@@ -1,17 +1,17 @@
 /* Please note:
- * This code is the optimized version of the first version of Matrix 
- * Stressmark. It uses less temporary vectors and vsariables, thus reduce 
- * memory allocation/deallocation overhead. the simulation is faster 
+ * This code is the optimized version of the first version of Matrix
+ * Stressmark. It uses less temporary vectors and vsariables, thus reduce
+ * memory allocation/deallocation overhead. the simulation is faster
  */
 /*
  *  Sample code for the DIS Matrix 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.
@@ -22,37 +22,37 @@
  *  The Sparse Matrix Storage is implemented by Compact Row Storage Scheme
  *  In the code, the data is first generated by randomNonzeroFloat()
  *  the data is first stored in a full-space matrix with size of dim*dim
- *  then the data is transfered to the Compact Row Matrix, 
+ *  then the data is transfered to the Compact Row Matrix,
  *  the data value is kept in *value,
  *  the columns corresponding to the value are stored in *col_ind,
  *  the start element of each row is stored in *row_start.
  */
- 
-/* 
- * Please note: 
+
+/*
+ * Please note:
  * the total number of data is numberNonzero +dim
  * among which, NumberNonzero because this is symmetric matrix
  * dim because the diagonal elements
  */
 
-#include <stdio.h>
+#include "DISstressmarkRNG.h"
+#include "extra.h"
+#include <assert.h>
 #include <math.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include <assert.h>
-#include "DISstressmarkRNG.h"
-#include "extra.h"
 
 #define MIN_SEED -2147483647
 #define MAX_SEED -1
-#define MIN_DIM  1
-#define MAX_DIM  32768
+#define MIN_DIM 1
+#define MAX_DIM 32768
 #define MAX_ITERATIONS 65536
-#define MIN_TOLERANCE 1e-7//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
-#define EPSI   1.0e-10
+#define MIN_NUMBER -3.4e10 / dim
+#define MAX_NUMBER 3.4e10 / dim
+#define EPSI 1.0e-10
 #define MIN_DIG_NUMBER 1.0e-10
 #define MAX_DIG_NUMBER 3.4e10
 
@@ -62,97 +62,90 @@
 
 static int dim;
 
-/*      
- *  matrix * vector     
+/*
+ *  matrix * vector
  */
 
-void matrixMulvector(double *value, 
-                     int *col_ind, 
-                     int *row_start,
-                     double  *vector,
-                     double *out)
-{  
+void matrixMulvector(double *value, int *col_ind, int *row_start,
+                     double *vector, double *out) {
   int l, ll;
-  double  sum;
+  double sum;
   int tmp_rs, tmp_re;
- 
-  for (l=0; l<dim; l++){  
-     *(out + l) = 0;
-     tmp_rs = row_start[l];
-    
-     if (tmp_rs != -1){
-      tmp_re = row_start[l+1];   /*
-                                  *get the start and ending elements of 
-                                  *  each row
-                                 */
-      for (ll=tmp_rs; ll<tmp_re; ll++){
-        *(out + l) += value[ll]*vector[col_ind[ll]];
+
+  for (l = 0; l < dim; l++) {
+    *(out + l) = 0;
+    tmp_rs = row_start[l];
+
+    if (tmp_rs != -1) {
+      tmp_re = row_start[l + 1]; /*
+                                  *get the start and ending elements of
+                                  *  each row
+                                  */
+      for (ll = tmp_rs; ll < tmp_re; ll++) {
+        *(out + l) += value[ll] * vector[col_ind[ll]];
       }
     }
   }
-  return; 
+  return;
 }
 
-
 /*
  *    vector1 - vector2
  */
 
-void  vectorSub(double  *vector1, double  *vector2, double *vector){
+void vectorSub(double *vector1, double *vector2, double *vector) {
 
   int l;
 
-  for (l=0; l<dim; l++){
+  for (l = 0; l < dim; l++) {
     *(vector + l) = *(vector1 + l) - *(vector2 + l);
   }
-  return; 
+  return;
 }
 
-
 /*
  * vector1 + vector2
  */
 
-void vectorAdd(double  *vector1, double  *vector2, double *vector){
+void vectorAdd(double *vector1, double *vector2, double *vector) {
 
   int l;
 
-  for (l=0; l<dim; l++){
+  for (l = 0; l < dim; l++) {
     *(vector + l) = *(vector1 + l) + *(vector2 + l);
   }
-  return; 
-} 
+  return;
+}
 
-/* 
+/*
  * vector1 * vector2
  */