Formatting.

disorderedmaterials · Dec 17, 2024 · 6b78ba5 · 6b78ba5
1 parent 8cc1833
commit 6b78ba5
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 40 deletions.
diff --git a/src/data/sginfo/sginfo.h b/src/data/sginfo/sginfo.h
@@ -145,7 +145,7 @@ extern "C"
                              "Tetragonal", "Trigonal",  "Hexagonal",  "Cubic"};
 #endif
 
-#define Make_PG_Code(i, p, l) (((i)*33 + (p)) * 12 + (l))
+#define Make_PG_Code(i, p, l) (((i) * 33 + (p)) * 12 + (l))
 #define PG_Unknown Make_PG_Code(0, 0, 0)
 #define PG_1 Make_PG_Code(1, 1, 1)
 #define PG_1b Make_PG_Code(2, 2, 1)

diff --git a/src/keywords/optionalDouble.cpp b/src/keywords/optionalDouble.cpp
@@ -8,8 +8,8 @@
 
 OptionalDoubleKeyword::OptionalDoubleKeyword(std::optional<double> &data, double minValue, std::optional<double> maxValue,
                                              double valueDelta, std::string_view textWhenNull)
-    : KeywordBase(typeid(this)), data_(data), minimumLimit_{minValue}, maximumLimit_{maxValue},
-      valueDelta_(valueDelta), textWhenNull_{textWhenNull}
+    : KeywordBase(typeid(this)), data_(data), minimumLimit_{minValue}, maximumLimit_{maxValue}, valueDelta_(valueDelta),
+      textWhenNull_{textWhenNull}
 {
 }
 

diff --git a/src/keywords/optionalInt.cpp b/src/keywords/optionalInt.cpp
@@ -8,8 +8,8 @@
 
 OptionalIntegerKeyword::OptionalIntegerKeyword(std::optional<int> &data, int minValue, std::optional<int> maxValue,
                                                int valueDelta, std::string_view textWhenNull)
-    : KeywordBase(typeid(this)), data_(data), minimumLimit_{minValue}, maximumLimit_{maxValue},
-      valueDelta_(valueDelta), textWhenNull_{textWhenNull}
+    : KeywordBase(typeid(this)), data_(data), minimumLimit_{minValue}, maximumLimit_{maxValue}, valueDelta_(valueDelta),
+      textWhenNull_{textWhenNull}
 {
 }
 

diff --git a/src/math/pcg_extras.h b/src/math/pcg_extras.h
@@ -244,9 +244,9 @@ std::basic_istream<CharT, Traits> &operator>>(std::basic_istream<CharT, Traits>
  * Ugh.
  */
 
-inline std::ostream &operator<<(std::ostream &out, uint8_t value) { return pcg_extras::operator<<<char>(out, value); }
+inline std::ostream &operator<<(std::ostream &out, uint8_t value) { return pcg_extras::operator<< <char>(out, value); }
 
-inline std::istream &operator>>(std::istream &in, uint8_t &value) { return pcg_extras::operator>><char>(in, value); }
+inline std::istream &operator>>(std::istream &in, uint8_t &value) { return pcg_extras::operator>> <char>(in, value); }
 
 /*
  * Useful bitwise operations.

diff --git a/src/math/pcg_uint128.h b/src/math/pcg_uint128.h
@@ -306,47 +306,29 @@ template <typename UInt, typename UIntX2> class uint_x4
 
     constexpr uint_x4(UInt v3, UInt v2, UInt v1, UInt v0)
 #if PCG_LITTLE_ENDIAN
-        : w
-    {
-        v0, v1, v2, v3
-    }
+        : w{v0, v1, v2, v3}
 #else
-        : w
-    {
-        v3, v2, v1, v0
-    }
+        : w{v3, v2, v1, v0}
 #endif
     {
         // Nothing (else) to do
     }
 
     constexpr uint_x4(UIntX2 v23, UIntX2 v01)
 #if PCG_LITTLE_ENDIAN
-        : d
-    {
-        v01, v23
-    }
+        : d{v01, v23}
 #else
-        : d
-    {
-        v23, v01
-    }
+        : d{v23, v01}
 #endif
     {
         // Nothing (else) to do
     }
 
     constexpr uint_x4(UIntX2 v01)
 #if PCG_LITTLE_ENDIAN
-        : d
-    {
-        v01, UIntX2(0)
-    }
+        : d{v01, UIntX2(0)}
 #else
-        : d
-    {
-        UIntX2(0), v01
-    }
+        : d{UIntX2(0), v01}
 #endif
     {
         // Nothing (else) to do
@@ -356,15 +338,9 @@ template <typename UInt, typename UIntX2> class uint_x4
                                                        sizeof(Integral) <= sizeof(UIntX2))>::type * = nullptr>
     constexpr uint_x4(Integral v01)
 #if PCG_LITTLE_ENDIAN
-        : d
-    {
-        UIntX2(v01), UIntX2(0)
-    }
+        : d{UIntX2(v01), UIntX2(0)}
 #else
-        : d
-    {
-        UIntX2(0), UIntX2(v01)
-    }
+        : d{UIntX2(0), UIntX2(v01)}
 #endif
     {
         // Nothing (else) to do

diff --git a/src/math/praxis.cpp b/src/math/praxis.cpp
@@ -1332,7 +1332,7 @@ double PrAxisMinimiser::r8_uniform_01(int &seed)
     {
         seed = seed + i4_huge;
     }
-    r = (double)(seed)*4.656612875E-10;
+    r = (double)(seed) * 4.656612875E-10;
     return r;
 }
 //****************************************************************************80