X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Finterpolator.h;h=6b3469ba01a4e4674352473beff7024880dfd5c1;hb=06066d9192936b4c4cc69847cd4c1f5aa7017829;hp=cea4961809cda3300db2c8b227d7639c3d1d734e;hpb=3ea498d51ce4597e9649cd21f155b51175ea0bea;p=ctsim.git

diff --git a/include/interpolator.h b/include/interpolator.h
index cea4961..6b3469b 100644
--- a/include/interpolator.h
+++ b/include/interpolator.h
@@ -2,7 +2,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: interpolator.h,v 1.2 2001/03/21 21:45:31 kevin Exp $
+**  $Id: interpolator.h,v 1.8 2003/01/30 21:53:16 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -34,6 +34,7 @@ public:
   double interpolate (double x);
 };
 
+
 class CubicPolyInterpolator {
 private:
   const double* const m_pdY;
@@ -52,8 +53,8 @@ template<class T>
 class BilinearInterpolator {
 private:
   T** const m_ppMatrix;
-  const unsigned int m_nx;
-  const unsigned int m_ny;
+  const int m_nx;
+  const int m_ny;
 
 public:
   BilinearInterpolator (T** ppMatrix, unsigned int nx, unsigned int ny)
@@ -62,8 +63,8 @@ public:
   
   T interpolate (double dXPos, double dYPos)
   {
-    int iFloorX = floor (dXPos);
-    int iFloorY = floor (dYPos);
+    int iFloorX = static_cast<int>(floor(dXPos));
+    int iFloorY = static_cast<int>(floor (dYPos));
     double dXFrac = dXPos - iFloorX;
     double dYFrac = dYPos - iFloorY;
 
@@ -72,16 +73,44 @@ public:
     if (iFloorX < 0 || iFloorY < 0 || iFloorX > m_nx-1 || iFloorY > m_ny-1)
       result = 0;
     else if (iFloorX == m_nx - 1 && iFloorY == m_ny - 1)
-      result = m_ppMatrix[m_nx-1][m_ny-1];
+      result = static_cast<T>(m_ppMatrix[m_nx-1][m_ny-1]);
     else if (iFloorX == m_nx - 1)
-      result = m_ppMatrix[iFloorX][iFloorY] + dYFrac * (m_ppMatrix[iFloorX][iFloorY+1] - m_ppMatrix[iFloorX][iFloorY]);
+      result = static_cast<T>(m_ppMatrix[iFloorX][iFloorY] + dYFrac * (m_ppMatrix[iFloorX][iFloorY+1] - m_ppMatrix[iFloorX][iFloorY]));
     else if (iFloorY == m_ny - 1)
-      result = m_ppMatrix[iFloorX][iFloorY] + dXFrac * (m_ppMatrix[iFloorX+1][iFloorY] - m_ppMatrix[iFloorX][iFloorY]);
+      result = static_cast<T>(m_ppMatrix[iFloorX][iFloorY] + dXFrac * (m_ppMatrix[iFloorX+1][iFloorY] - m_ppMatrix[iFloorX][iFloorY]));
     else
-      result = (1 - dXFrac) * (1 - dYFrac) * m_ppMatrix[iFloorX][iFloorY] + 
+      result = static_cast<T>((1 - dXFrac) * (1 - dYFrac) * m_ppMatrix[iFloorX][iFloorY] + 
         dXFrac * (1 - dYFrac) * m_ppMatrix[iFloorX+1][iFloorY] + 
         dYFrac * (1 - dXFrac) * m_ppMatrix[iFloorX][iFloorY+1] +
-        dXFrac * dYFrac * m_ppMatrix[iFloorX+1][iFloorY+1];
+        dXFrac * dYFrac * m_ppMatrix[iFloorX+1][iFloorY+1]);
+
+    return result;
+  }
+};
+
+
+template<class T>
+class BicubicPolyInterpolator {
+private:
+  T** const m_ppMatrix;
+  const unsigned int m_nx;
+  const unsigned int m_ny;
+
+public:
+  BicubicPolyInterpolator (T** ppMatrix, unsigned int nx, unsigned int ny)
+  : m_ppMatrix(ppMatrix), m_nx(nx), m_ny(ny)
+  {}
+  
+  T interpolate (double dXPos, double dYPos)
+  {
+    // int iFloorX = static_cast<int>(floor (dXPos));
+    // int iFloorY = static_cast<int>(floor (dYPos));
+    // double dXFrac = dXPos - iFloorX;
+    // double dYFrac = dYPos - iFloorY;
+
+    T result = 0;
+
+    // Need to add code
 
     return result;
   }
@@ -91,17 +120,18 @@ public:
 template<class T>
 class LinearInterpolator {
 private:
-  T* const m_pY;
   T* const m_pX;
-  const unsigned int m_n;
+  T* const m_pY;
+  const int m_n;
+  const bool m_bZeroOutsideRange;
 
 public:
-  LinearInterpolator (T* pY, unsigned int n)
-  : m_pY(pY), m_pX(0), m_n(n)
+  LinearInterpolator (T* pY, unsigned int n, bool bZeroOutside = true)
+  : m_pX(0), m_pY(pY), m_n(n), m_bZeroOutsideRange(bZeroOutside)
   {}
   
-  LinearInterpolator (T* pY, T* pX, unsigned int n)
-  : m_pY(pY), m_pX(pX), m_n(n)
+  LinearInterpolator (T* pX, T* pY, unsigned int n, bool bZeroOutside = true)
+  : m_pX(pX), m_pY(pY), m_n(n), m_bZeroOutsideRange(bZeroOutside)
   {}
   
   double interpolate (double dX, int* piLastFloor = NULL)
@@ -111,14 +141,20 @@ public:
     if (! m_pX) {
       if (dX == 0)
         result = m_pY[0];
-      else if (dX < 0)
-        result = 0;
-      else if (dX == m_n - 1)
+      else if (dX < 0) {
+        if (m_bZeroOutsideRange)
+          result = 0;
+        else
+          result = m_pY[0];
+      } else if (dX == m_n - 1)
         result = m_pY[m_n-1];
-      else if (dX > m_n - 1)
-        result = 0;
-      else {
-       int iFloor = floor(dX);
+      else if (dX > m_n - 1) {
+        if (m_bZeroOutsideRange)
+          result = 0;
+        else
+          result = m_pY[m_n - 1];
+      } else {
+       int iFloor = static_cast<int>(floor(dX));
        result = m_pY[iFloor] + (m_pY[iFloor+1] - m_pY[iFloor]) * (dX - iFloor);
       }
     } else {
@@ -136,13 +172,19 @@ public:
       }
       if (dX == m_pX[0])
         result = m_pY[0];
-      else if (dX < m_pX[0])
-        result = 0;
-      else if (dX == m_pX[m_n-1])
+      else if (dX < m_pX[0]) {
+        if (m_bZeroOutsideRange)
+          result = 0;
+        else
+          result = m_pY[0];
+      } else if (dX == m_pX[m_n-1])
         result = m_pY[m_n-1];
-      else if (dX > m_pX[m_n-1])
-        result = 0;
-      else {
+      else if (dX > m_pX[m_n - 1]) {
+        if (m_bZeroOutsideRange)
+          result = 0;
+        else
+          result = m_pY[m_n - 1];
+      } else {
         if (iLower < 0 || iLower >= m_n) {
           sys_error (ERR_SEVERE, "Coordinate out of range [linearInterpolate]");
           return 0;