commit c62bb845cd2e66a7def39f54f2345f78fd23098a
author Sameer Agarwal <sameeragarwal@google.com> Sun Feb 08 10:53:37 2015 -0800
committer Sameer Agarwal <sameeragarwal@google.com> Sun Feb 08 10:56:39 2015 -0800
tree 2772d04525d6f119f6221a78278b1f5bbd621a06
parent 3125c23228dd6cc7f3f50781da441484cc223575

Fix sampled_function.cc to use the new CubicInterpolator API.

Change-Id: I1b2063505dc2296c141989c93a939175d5dba7e1

examples/sampled_function.cc

diff --git a/examples/sampled_function.cc b/examples/sampled_function.cc
index 44566f4..03d84fb 100644
--- a/examples/sampled_function.cc
+++ b/examples/sampled_function.cc
@@ -35,6 +35,7 @@
 #include "ceres/cubic_interpolation.h"
 #include "glog/logging.h"
 
+using ceres::Array1D;
 using ceres::CubicInterpolator;
 using ceres::AutoDiffCostFunction;
 using ceres::CostFunction;
@@ -45,7 +46,8 @@
 // A simple cost functor that interfaces an interpolated table of
 // values with automatic differentiation.
 struct InterpolatedCostFunctor {
-  explicit InterpolatedCostFunctor(const CubicInterpolator& interpolator)
+  explicit InterpolatedCostFunctor(
+      const CubicInterpolator<Array1D<double> >& interpolator)
       : interpolator_(interpolator) {
   }
 
@@ -53,13 +55,14 @@
     return interpolator_.Evaluate(*x, residuals);
   }
 
-  static CostFunction* Create(const CubicInterpolator& interpolator) {
+  static CostFunction* Create(
+      const CubicInterpolator<Array1D<double> >& interpolator) {
     return new AutoDiffCostFunction<InterpolatedCostFunctor, 1, 1>(
         new InterpolatedCostFunctor(interpolator));
   }
 
  private:
-  const CubicInterpolator& interpolator_;
+  const CubicInterpolator<Array1D<double> >& interpolator_;
 };
 
 int main(int argc, char** argv) {
@@ -72,7 +75,8 @@
     values[i] = (i - 4.5) * (i - 4.5);
   }
 
-  CubicInterpolator interpolator(values, kNumSamples);
+  Array1D<double> array(values, kNumSamples);
+  CubicInterpolator<Array1D<double> > interpolator(array);
 
   double x = 1.0;
   Problem problem;