Changeset 17122 for trunk/Mars/mcore

Timestamp:

09/06/13 20:30:34 (11 years ago)

Author:

tbretz

Message:

Some fixes for compiler stuff, added some more setters to allow a more C++ style for setting data.

File:

• trunk/Mars/mcore/Interpolator2D.h (modified) (6 diffs)

trunk/Mars/mcore/Interpolator2D.h

@@ -17 +17 @@
 #define FACT_Interpolator2D
 
+#include <float.h>
 #include <vector>
 
@@ -173 +174 @@
         for (auto ip=outputGrid.cbegin(); ip<outputGrid.cend(); ip++)
         {
-            double mindd = FLT_MAX;
+            double mindd = DBL_MAX;
 
             auto mint = circles.cend();
@@ -283 +284 @@
     }
 
+    Interpolator2D(const std::vector<Interpolator2D::vec> &v)
+    {
+        SetInputGrid(v);
+    }
+
     const std::vector<Interpolator2D::weight> getWeights() const { return weights; }
     const std::vector<Interpolator2D::point>  getInputGrid() const { return inputGrid; }
@@ -316 +322 @@
     }
 
+    void SetInputGrid(const std::vector<Interpolator2D::vec> &v)
+    {
+        circles.clear();
+        weights.clear();
+        outputGrid.clear();
+
+        inputGrid.clear();
+        inputGrid.reserve(v.size());
+        for (size_t i=0; i<v.size(); i++)
+            inputGrid.emplace_back(i, v[i].x, v[i].y);
+
+        CalculateGrid();
+    }
+
     // --------------------------------------------------------------------------
     //
@@ -349 +369 @@
     }
 
+    bool SetOutputGrid(const std::vector<std::pair<double,double>> &v)
+    {
+        if (inputGrid.empty())
+            return false;
+
+        weights.clear();
+
+        outputGrid.clear();
+        outputGrid.reserve(v.size());
+        for (size_t i=0; i<v.size(); i++)
+            outputGrid.emplace_back(i, v[i].first, v[i].second);
+
+        return CalculateWeights();
+    }
+
     // --------------------------------------------------------------------------
     //
@@ -362 +397 @@
     //!    not match the size of the inputGrid, an empty vector is returned.
     //
-    std::vector<double> Interpolate(const vector<double> &z) const
+    std::vector<double> Interpolate(const std::vector<double> &z) const
     {
         if (z.size()!=inputGrid.size())