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

diff --git a/include/interpolator.h b/include/interpolator.h
index 6b3469b..c30dd7d 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.8 2003/01/30 21:53:16 kevin Exp $
+**  $Id$
 **
 **  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
@@ -60,32 +60,100 @@ public:
   BilinearInterpolator (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;
+{
+  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;
+  T result = 0;
 
-    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)
+  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 = static_cast<T>(m_ppMatrix[m_nx-1][m_ny-1]);
-    else if (iFloorX == m_nx - 1)
-      result = static_cast<T>(m_ppMatrix[iFloorX][iFloorY] + dYFrac * (m_ppMatrix[iFloorX][iFloorY+1] - m_ppMatrix[iFloorX][iFloorY]));
+  else if (iFloorX == m_nx - 1)
+    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 = static_cast<T>(m_ppMatrix[iFloorX][iFloorY] + dXFrac * (m_ppMatrix[iFloorX+1][iFloorY] - m_ppMatrix[iFloorX][iFloorY]));
+  else
+    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]);
+
+  return result;
+}
+    };
+
+
+template<class T>
+class BilinearPolarInterpolator {
+private:
+  T** const m_ppMatrix;
+  const int m_nAngle;
+  const int m_nPos;
+  int m_nCenterPos;
+
+public:
+  BilinearPolarInterpolator (T** ppMatrix, unsigned int nAngle,
+                             unsigned int nPos)
+  : m_ppMatrix(ppMatrix), m_nAngle(nAngle), m_nPos(nPos)
+  {
+    if (m_nPos %2)
+      m_nCenterPos = (m_nPos - 1) / 2;
     else
-      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]);
+      m_nCenterPos = m_nPos / 2;
+  }
 
-    return result;
+  T interpolate (double dAngle, double dPos)
+{
+  int iFloorAngle = static_cast<int>(floor(dAngle));
+  int iFloorPos = static_cast<int>(floor (dPos));
+  double dAngleFrac = dAngle - iFloorAngle;
+  double dPosFrac = dPos - iFloorPos;
+
+  T result = 0;
+
+  if (iFloorAngle < -1 || iFloorPos < 0 || iFloorAngle > m_nAngle-1 || iFloorPos > m_nPos-1)
+    result = 0;
+  else if (iFloorAngle == -1 && iFloorPos == m_nPos-1)
+    result = static_cast<T>(m_ppMatrix[0][m_nPos-1] + dAngleFrac * (m_ppMatrix[m_nAngle-1][iFloorPos] - m_ppMatrix[0][iFloorPos]));
+  else if (iFloorAngle == m_nAngle - 1 && iFloorPos == m_nPos-1)
+    result = static_cast<T>(m_ppMatrix[m_nAngle-1][m_nPos-1] + dAngleFrac * (m_ppMatrix[0][iFloorPos] - m_ppMatrix[m_nAngle-1][iFloorPos]));
+  else if (iFloorPos == m_nPos - 1)
+    result = static_cast<T>(m_ppMatrix[iFloorAngle][iFloorPos] + dAngleFrac * (m_ppMatrix[iFloorAngle+1][iFloorPos] - m_ppMatrix[iFloorAngle][iFloorPos]));
+  else {
+    if (iFloorAngle == m_nAngle-1) {
+      int iUpperAngle = 0;
+      int iLowerPos = (m_nPos-1) - iFloorPos;
+      int iUpperPos = (m_nPos-1) - (iFloorPos+1);
+      result = static_cast<T>
+        ((1-dAngleFrac) * (1-dPosFrac) * m_ppMatrix[iFloorAngle][iFloorPos] +
+         dAngleFrac * (1-dPosFrac) * m_ppMatrix[iUpperAngle][iLowerPos] +
+         dPosFrac * (1-dAngleFrac) * m_ppMatrix[iFloorAngle][iFloorPos+1] +
+         dAngleFrac * dPosFrac * m_ppMatrix[iUpperAngle][iUpperPos]);
+    } else if (iFloorAngle == -1) {
+      int iLowerAngle = m_nAngle - 1;
+      int iLowerPos = (m_nPos-1) - iFloorPos;
+      int iUpperPos = (m_nPos-1) - (iFloorPos+1);
+      result = static_cast<T>
+        ((1-dAngleFrac) * (1-dPosFrac) * m_ppMatrix[iLowerAngle][iLowerPos] +
+         dAngleFrac * (1-dPosFrac) * m_ppMatrix[iFloorAngle+1][iFloorPos] +
+         dPosFrac * (1-dAngleFrac) * m_ppMatrix[iLowerAngle][iUpperPos] +
+         dAngleFrac * dPosFrac * m_ppMatrix[iFloorAngle+1][iFloorPos+1]);
+    } else
+      result = static_cast<T>
+        ((1-dAngleFrac) * (1-dPosFrac) * m_ppMatrix[iFloorAngle][iFloorPos] +
+         dAngleFrac * (1-dPosFrac) * m_ppMatrix[iFloorAngle+1][iFloorPos] +
+         dPosFrac * (1-dAngleFrac) * m_ppMatrix[iFloorAngle][iFloorPos+1] +
+         dAngleFrac * dPosFrac * m_ppMatrix[iFloorAngle+1][iFloorPos+1]);
   }
+  return result;
+}
 };
 
 
@@ -100,7 +168,7 @@ 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));
@@ -129,11 +197,11 @@ public:
   LinearInterpolator (T* pY, unsigned int n, bool bZeroOutside = true)
   : m_pX(0), m_pY(pY), m_n(n), m_bZeroOutsideRange(bZeroOutside)
   {}
-  
+
   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)
   {
     double result = 0;