More consistently use doubles in makemhr and loadsofa

1 files changed, 37 insertions, 32 deletions

diff --git a/utils/makemhr/loadsofa.cpp b/utils/makemhr/loadsofa.cpp
index e0c08349..49d16556 100644
--- a/utils/makemhr/loadsofa.cpp
+++ b/utils/makemhr/loadsofa.cpp
@@ -24,6 +24,7 @@
 #include "loadsofa.h"
 
 #include <algorithm>
+#include <array>
 #include <cmath>
 #include <cstdio>
 #include <iterator>
@@ -37,6 +38,8 @@
 #include "mysofa.h"
 
 
+using double3 = std::array<double,3>;
+
 static const char *SofaErrorStr(int err)
 {
     switch(err)
@@ -57,18 +60,18 @@ static const char *SofaErrorStr(int err)
  * of other axes as necessary.  The epsilons are used to constrain the
  * equality of unique elements.
  */
-static uint GetUniquelySortedElems(const uint m, const float *triplets, const uint axis,
-    const double *const (&filters)[3], const double (&epsilons)[3], float *elems)
+static uint GetUniquelySortedElems(const uint m, const double3 *aers, const uint axis,
+    const double *const (&filters)[3], const double (&epsilons)[3], double *elems)
 {
     uint count{0u};
-    for(uint i{0u};i < 3*m;i += 3)
+    for(uint i{0u};i < m;++i)
     {
-        const float elem{triplets[i + axis]};
+        const double elem{aers[i][axis]};
 
         uint j;
         for(j = 0;j < 3;j++)
         {
-            if(filters[j] && std::fabs(triplets[i + j] - *filters[j]) > epsilons[j])
+            if(filters[j] && std::fabs(aers[i][j] - *filters[j]) > epsilons[j])
                 break;
         }
         if(j < 3)
@@ -76,7 +79,7 @@ static uint GetUniquelySortedElems(const uint m, const float *triplets, const ui
 
         for(j = 0;j < count;j++)
         {
-            const float delta{elem - elems[j]};
+            const double delta{elem - elems[j]};
 
             if(delta > epsilons[axis])
                 continue;
@@ -104,9 +107,9 @@ static uint GetUniquelySortedElems(const uint m, const float *triplets, const ui
  * half, but in degenerate cases this can fall to a minimum of 5 (the lower
  * limit on elevations necessary to build a layout).
  */
-static float GetUniformStepSize(const double epsilon, const uint m, const float *elems)
+static double GetUniformStepSize(const double epsilon, const uint m, const double *elems)
 {
-    auto steps = std::vector<float>(m, 0.0f);
+    auto steps = std::vector<double>(m, 0.0);
     auto counts = std::vector<uint>(m, 0u);
     uint count{0u};
 
@@ -114,7 +117,7 @@ static float GetUniformStepSize(const double epsilon, const uint m, const float
     {
         for(uint i{0u};i < m-stride;i++)
         {
-            const float step{elems[i + stride] - elems[i]};
+            const double step{elems[i + stride] - elems[i]};
 
             uint j;
             for(j = 0;j < count;j++)
@@ -151,7 +154,7 @@ static float GetUniformStepSize(const double epsilon, const uint m, const float
 
     if(counts[0] > 5)
         return steps[0];
-    return 0.0f;
+    return 0.0;
 }
 
 /* Attempts to produce a compatible layout.  Most data sets tend to be
@@ -162,15 +165,16 @@ static float GetUniformStepSize(const double epsilon, const uint m, const float
  */
 static bool PrepareLayout(const uint m, const float *xyzs, HrirDataT *hData)
 {
-    std::vector<float> aers(3*m, 0.0f);
-    std::vector<float> elems(m, 0.0f);
+    auto aers = std::vector<double3>(m, double3{});
+    auto elems = std::vector<double>(m, 0.0);
 
-    for(uint i{0u};i < 3*m;i += 3)
+    for(uint i{0u};i < m;++i)
     {
-        aers[i] = xyzs[i];
-        aers[i + 1] = xyzs[i + 1];
-        aers[i + 2] = xyzs[i + 2];
-        mysofa_c2s(&aers[i]);
+        float aer[3]{xyzs[i*3], xyzs[i*3 + 1], xyzs[i*3 + 2]};
+        mysofa_c2s(&aer[0]);
+        aers[i][0] = aer[0];
+        aers[i][1] = aer[1];
+        aers[i][2] = aer[2];
     }
 
     const uint fdCount{GetUniquelySortedElems(m, aers.data(), 2, { nullptr, nullptr, nullptr },
@@ -183,7 +187,7 @@ static bool PrepareLayout(const uint m, const float *xyzs, HrirDataT *hData)
 
     double distances[MAX_FD_COUNT]{};
     uint evCounts[MAX_FD_COUNT]{};
-    auto azCounts = std::vector<uint>(MAX_FD_COUNT * MAX_EV_COUNT);
+    auto azCounts = std::vector<uint>(MAX_FD_COUNT*MAX_EV_COUNT, 0u);
     for(uint fi{0u};fi < fdCount;fi++)
     {
         distances[fi] = elems[fi];
@@ -211,8 +215,8 @@ static bool PrepareLayout(const uint m, const float *xyzs, HrirDataT *hData)
             return false;
         }
 
-        float step{GetUniformStepSize(0.1, evCount, elems.data())};
-        if(step <= 0.0f)
+        double step{GetUniformStepSize(0.1, evCount, elems.data())};
+        if(step <= 0.0)
         {
             fprintf(stderr, "Incompatible layout (non-uniform elevations).\n");
             return false;
@@ -221,18 +225,18 @@ static bool PrepareLayout(const uint m, const float *xyzs, HrirDataT *hData)
         uint evStart{0u};
         for(uint ei{0u};ei < evCount;ei++)
         {
-            float ev{90.0f + elems[ei]};
-            float eif{std::round(ev / step)};
+            double ev{90.0 + elems[ei]};
+            double eif{std::round(ev / step)};
             const uint ei_start{static_cast<uint>(eif)};
 
-            if(std::fabs(eif - static_cast<float>(ei_start)) < (0.1f/step))
+            if(std::fabs(eif - static_cast<double>(ei_start)) < (0.1/step))
             {
                 evStart = ei_start;
                 break;
             }
         }
 
-        evCount = static_cast<uint>(std::round(180.0f / step)) + 1;
+        evCount = static_cast<uint>(std::round(180.0 / step)) + 1;
         if(evCount < 5)
         {
             fprintf(stderr, "Incompatible layout (too few uniform elevations).\n");
@@ -247,22 +251,23 @@ static bool PrepareLayout(const uint m, const float *xyzs, HrirDataT *hData)
             const uint azCount{GetUniquelySortedElems(m, aers.data(), 0, { nullptr, &ev, &dist },
                 { 0.1, 0.1, 0.001 }, elems.data())};
 
-            if(azCount > MAX_AZ_COUNT)
-            {
-                fprintf(stderr, "Incompatible layout (innumerable azimuths).\n");
-                return false;
-            }
-
             if(ei > 0 && ei < (evCount - 1))
             {
                 step = GetUniformStepSize(0.1, azCount, elems.data());
-                if(step <= 0.0f)
+                if(step <= 0.0)
                 {
                     fprintf(stderr, "Incompatible layout (non-uniform azimuths).\n");
                     return false;
                 }
 
-                azCounts[fi*MAX_EV_COUNT + ei] = static_cast<uint>(std::round(360.0f / step));
+                azCounts[fi*MAX_EV_COUNT + ei] = static_cast<uint>(std::round(360.0 / step));
+                if(azCounts[fi*MAX_EV_COUNT + ei] > MAX_AZ_COUNT)
+                {
+                    fprintf(stderr,
+                        "Incompatible layout (too many azimuths on elev=%f, rad=%f, %u > %u).\n",
+                         ev, dist, azCounts[fi*MAX_EV_COUNT + ei], MAX_AZ_COUNT);
+                    return false;
+                }
             }
             else if(azCount != 1)
             {