git-svn-id: file:///home/svn/opt_utilities@174 ed2142bd-67ad-457f-ba7c-d818d4011675

1 files changed, 6 insertions, 12 deletions

diff --git a/pre_estimater/lin1d_estimater.hpp b/pre_estimater/lin1d_estimater.hpp
index 1ec62cb..e36f2a7 100644
--- a/pre_estimater/lin1d_estimater.hpp
+++ b/pre_estimater/lin1d_estimater.hpp
@@ -2,33 +2,27 @@
 #define LIN1D_ESTIMATER
 #include "pre_estimater.hpp"
 #include <misc/optvec.hpp>
-#include <vmodels/lin1d.hpp>
-
+#include <models/lin1d.hpp>
+#include <vector>
 
 namespace opt_utilities
 {
   template <typename T>
   class lin1d_estimater
-    :public pre_estimater<optvec<T>,optvec<T>,optvec<T>,T,std::string>
+    :public pre_estimater<T,T,std::vector<T>,std::string>
   {
   private:
-    const std::string model_id;
-  private:
     lin1d_estimater()
-      :model_id(lin1d<T>().get_type_name())
-    {}
+    {
+    }
 
     lin1d_estimater<T> do_clone()const
     {
       return new lin1d_estimater<T>(*this);
     }
 
-    void do_estimate(fitter<optvec<T>,optvec<T>,optvec<T>,T,std::string>& fit)const
+    void do_estimate(const data<T,T>& d,model<T,T,std::vector<T>,std::string>& m)const
     {
-      if(model_id!=fit.get_model().get_type_name())
-	{
-	  return;
-	}
     }
   };
 }