aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorastrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675>2009-04-06 16:36:52 +0000
committerastrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675>2009-04-06 16:36:52 +0000
commitceb836399f56b60ad82a73e67f4cbd361d834582 (patch)
treeff410afea4b18b729d453942db7ce951f9df0804
parentb025e3add3aeb1e5e79ba167398fbce8f4d75b21 (diff)
downloadopt-utilities-ceb836399f56b60ad82a73e67f4cbd361d834582.tar.bz2
git-svn-id: file:///home/svn/opt_utilities@18 ed2142bd-67ad-457f-ba7c-d818d4011675
-rw-r--r--data_sets/default_data_set.hpp (renamed from core/default_data_set.hpp)2
-rw-r--r--data_sets/sorted_data_set.hpp (renamed from core/sorted_data_set.hpp)2
-rw-r--r--interface/opt.cc2
-rw-r--r--utilities/opt_types.hpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/core/default_data_set.hpp b/data_sets/default_data_set.hpp
index 20992c4..887e3d2 100644
--- a/core/default_data_set.hpp
+++ b/data_sets/default_data_set.hpp
@@ -1,6 +1,6 @@
#ifndef DEFAULT_DATA_SET
#define DEFAULT_DATA_SET
-#include "fitter.hpp"
+#include "core/fitter.hpp"
#include <vector>
diff --git a/core/sorted_data_set.hpp b/data_sets/sorted_data_set.hpp
index f825b6c..f12edac 100644
--- a/core/sorted_data_set.hpp
+++ b/data_sets/sorted_data_set.hpp
@@ -1,6 +1,6 @@
#ifndef SORTED_DATA_SET
#define SORTED_DATA_SET
-#include "fitter.hpp"
+#include "core/fitter.hpp"
#include <vector>
#include <algorithm>
diff --git a/interface/opt.cc b/interface/opt.cc
index ce492d1..42dfcb3 100644
--- a/interface/opt.cc
+++ b/interface/opt.cc
@@ -3,7 +3,7 @@
#include <models/models.hpp>
#include <map>
#include <core/freeze_param.hpp>
-#include <core/default_data_set.hpp>
+#include <data_sets/default_data_set.hpp>
//#include <iostream>
using namespace std;
diff --git a/utilities/opt_types.hpp b/utilities/opt_types.hpp
index 46846cd..fd76169 100644
--- a/utilities/opt_types.hpp
+++ b/utilities/opt_types.hpp
@@ -2,7 +2,7 @@
#define OPT_TYPES_HPP
#include <core/optimizer.hpp>
#include <core/fitter.hpp>
-#include <core/default_data_set.hpp>
+#include <data_sets/default_data_set.hpp>
#include <methods/powell/powell_method.hpp>
#include <statistics/chisq.hpp>
#include <statistics/leastsq.hpp>