From ac1767770e64d0afb731be29345e9acd0a06387d Mon Sep 17 00:00:00 2001
From: astrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675>
Date: Tue, 25 Jan 2011 17:05:46 +0000
Subject: git-svn-id: file:///home/svn/opt_utilities@167
 ed2142bd-67ad-457f-ba7c-d818d4011675

---
 interface/perform_fit.hpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/interface/perform_fit.hpp b/interface/perform_fit.hpp
index 5ae4e6d..3b1394e 100644
--- a/interface/perform_fit.hpp
+++ b/interface/perform_fit.hpp
@@ -1,3 +1,7 @@
+#ifndef PERFORM_FIT_HPP
+#define PERFORM_FIT_HPP
+
+/*
 #include <statistics/chisq.hpp>
 #include <statistics/cstat.hpp>
 #include <data_sets/default_data_set.hpp>
@@ -14,6 +18,8 @@
 #include <models/poly1d.hpp>
 #include <models/pl1d.hpp>
 #include <models/models.hpp>
+*/
+#include <interface/type_depository.hpp>
 
 namespace opt_utilities
 {
@@ -23,20 +29,23 @@ namespace opt_utilities
   void perform_fit(const char* model_name,
 		   const char* method_name,
 		   const char* statistic_name,
-		   const datat_set<Ty,Tx>& ds,
+		   const data_set<Ty,Tx>& ds,
 		   const char* froze_parameters
 		   )
   {
     fitter<Ty,Tx,Tp,Ts,Tstr> fit;
     fit.load_data(ds);
-    const statistic<Ty,Tx,Tp,Ts,Tstr>* pstat=get_statistic(statistic_name);
+    const statistic<Ty,Tx,Tp,Ts,Tstr>* pstat=get_statistic<Ty,Tx,Tp,Ts,Tstr>(statistic_name);
     fit.set_statistic(*pstat);
-    const opt_method<Ts,Tp>* popm=get_opt_method(method_name);
+    const opt_method<Ts,Tp>* popm=get_opt_method<Ty,Tp>(method_name);
     fit.set_opt_method(*popm);
-    const model<Ty,Tx,Tp,Tstr>* pmo=get_model(model_name);
+    const model<Ty,Tx,Tp,Tstr>* pmo=get_model<Ty,Tx,Tp,Tstr>(model_name);
     fit.set_model(*pmo);
     fit.fit();
   }
 
 
 }
+
+#endif
+
-- 
cgit v1.2.2