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.

3 files changed, 231 insertions, 282 deletions

diff --git a/dis/Neighborhood/DISstressmarkRNG.h b/dis/Neighborhood/DISstressmarkRNG.h
index 4aa2620..6243606 100644
--- a/dis/Neighborhood/DISstressmarkRNG.h
+++ b/dis/Neighborhood/DISstressmarkRNG.h
@@ -1,3 +1,4 @@
+#include <assert.h>
 #include <math.h>
 
 #define IA 16807
diff --git a/dis/Neighborhood/neighborhood.c b/dis/Neighborhood/neighborhood.c
index 23f3a8e..614b8e8 100644
--- a/dis/Neighborhood/neighborhood.c
+++ b/dis/Neighborhood/neighborhood.c
@@ -1,12 +1,12 @@
 /*
  *  Sample code for the DIS Neighborhood 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.
@@ -17,19 +17,18 @@
  * 06/2020 Joshua Bakita    Include image creation time in timing
  */
 
+#include "DISstressmarkRNG.h"
+#include "extra.h"
+#include "utili.h"
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include<assert.h>
-#include "DISstressmarkRNG.h"
-#include "utili.h"
-#include "extra.h"
 
-/* 
+/*
  * main()
  */
-int main(int argc, char** argv)
-{
+int main(int argc, char **argv) {
   long int seed;
   int dimension;
   int numberLines;
@@ -46,10 +45,9 @@ int main(int argc, char** argv)
   time_t endTime;
   SET_UP
 
-  assert(fscanf(stdin, "%ld %d %d %d %d %d %d %d", 
-        &seed, &bitDepth, &dimension, &numberLines,
-        &minThickness, &maxThickness,
-        &distanceShort, &distanceLong) == 8);
+  assert(fscanf(stdin, "%ld %d %d %d %d %d %d %d", &seed, &bitDepth, &dimension,
+                &numberLines, &minThickness, &maxThickness, &distanceShort,
+                &distanceLong) == 8);
 
   assert((seed >= MIN_SEED) && (seed <= MAX_SEED));
   assert((dimension > 0) && (dimension <= MAX_DIMENSION));
@@ -67,43 +65,32 @@ int main(int argc, char** argv)
 
   beginTime = time(NULL);
   START_LOOP
-  createImage(image, dimension, maxPixel, numberLines,
-                      minThickness, maxThickness);
+  createImage(image, dimension, maxPixel, numberLines, minThickness,
+              maxThickness);
 
-  neighborhoodCalculation(image, dimension,
-                          distanceShort, distanceLong, &values, maxPixel);
+  neighborhoodCalculation(image, dimension, distanceShort, distanceLong,
+                          &values, maxPixel);
   STOP_LOOP
   endTime = time(NULL);
   WRITE_TO_FILE
 
-//  printf(" end time is %d\n", endTime);
+  //  printf(" end time is %d\n", endTime);
 
-  fprintf(stdout, "%9.4e %9.4e %9.4e %9.4e %9.4e %9.4e %9.4e %9.4e", 
-          values.distShort.deg0.entropy,
-          values.distShort.deg0.energy,
-          values.distShort.deg45.entropy,
-          values.distShort.deg45.energy,
-          values.distShort.deg90.entropy,
-          values.distShort.deg90.energy,
-          values.distShort.deg135.entropy,
-          values.distShort.deg135.energy);
+  fprintf(stdout, "%9.4e %9.4e %9.4e %9.4e %9.4e %9.4e %9.4e %9.4e",
+          values.distShort.deg0.entropy, values.distShort.deg0.energy,
+          values.distShort.deg45.entropy, values.distShort.deg45.energy,
+          values.distShort.deg90.entropy, values.distShort.deg90.energy,
+          values.distShort.deg135.entropy, values.distShort.deg135.energy);
 
-  fprintf(stdout,"%9.4e %9.4e %9.4e %9.4e %9.4e %9.4e %9.4e %9.4e",
-          values.distLong.deg0.entropy,
-          values.distLong.deg0.energy,values.distShort.deg45.entropy,
-          values.distLong.deg45.energy,
-          values.distLong.deg90.entropy,
-          values.distLong.deg90.energy,
-          values.distLong.deg135.entropy,
-          values.distLong.deg135.energy);
+  fprintf(stdout, "%9.4e %9.4e %9.4e %9.4e %9.4e %9.4e %9.4e %9.4e",
+          values.distLong.deg0.entropy, values.distLong.deg0.energy,
+          values.distShort.deg45.entropy, values.distLong.deg45.energy,
+          values.distLong.deg90.entropy, values.distLong.deg90.energy,
+          values.distLong.deg135.entropy, values.distLong.deg135.energy);
 
   fprintf(stderr, "time for neghborhood stressmark = %f seconds.\n",
-          difftime(endTime, beginTime));
-          
+          difftime(endTime, beginTime));
+
   free((Pixel *)image);
   return (SUCCESS);
-  }
-
-
-
-   
+}
diff --git a/dis/Neighborhood/utili.h b/dis/Neighborhood/utili.h
index 5b54d9b..b5a7498 100644
--- a/dis/Neighborhood/utili.h
+++ b/dis/Neighborhood/utili.h
@@ -1,12 +1,12 @@
 /*
  *  Sample code for the DIS Pointer 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,287 +22,248 @@
 
 #define MIN_PIXEL 0
 #define MAX_DIMENSION 32768
-#define MIN_SEED  -2147483647
-#define MAX_SEED  -1
+#define MIN_SEED -2147483647
+#define MAX_SEED -1
 #define MAX_NUMBER_LINES 65536
-#define MIN_BIT_DEPTH    7
-#define MAX_BIT_DEPTH    15
+#define MIN_BIT_DEPTH 7
+#define MAX_BIT_DEPTH 15
 
 typedef struct {
   int column;
   int row;
-}Coord;
+} Coord;
 
-/* 
+/*
  * Neighborhood structure consists of the GLCM descriptors entropy and
- * energy for each of 2 distance and 4 angels 
+ * energy for each of 2 distance and 4 angels
  */
 typedef struct {
   float entropy;
   float energy;
-}Descriptors;
+} Descriptors;