aboutsummaryrefslogtreecommitdiffstats
path: root/models/models.hpp
diff options
context:
space:
mode:
authorastrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675>2011-01-20 17:32:15 +0000
committerastrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675>2011-01-20 17:32:15 +0000
commit50e769e8f1a5234c3ca3969088e407d3212e6ce3 (patch)
tree9ed3e60b3b54bf03c5d8abc1d70a202a1c546db8 /models/models.hpp
parent753815615b9a0f39cc19961c5388902ee3a63654 (diff)
downloadopt-utilities-50e769e8f1a5234c3ca3969088e407d3212e6ce3.tar.bz2
git-svn-id: file:///home/svn/opt_utilities@165 ed2142bd-67ad-457f-ba7c-d818d4011675
Diffstat (limited to 'models/models.hpp')
-rw-r--r--models/models.hpp12
1 files changed, 1 insertions, 11 deletions
diff --git a/models/models.hpp b/models/models.hpp
index b3bf762..76a8ecf 100644
--- a/models/models.hpp
+++ b/models/models.hpp
@@ -13,30 +13,20 @@
#include <string>
#include <list>
#include "vecn.hpp"
-#include "strmodel1d.hpp"
namespace opt_utilities
{
extern std::map<std::string,model<double,double,std::vector<double>,std::string>* > model_map;
- extern std::map<std::string,model<double,vecn<double,2>,std::vector<double>,std::string >* > model2d_map;
- extern strmodel1d strm1d;
extern std::list<std::string> get_model_name_list();
extern int get_n_1dmodels();
// extern void init_model_map();
// extern void release_model_map();
- extern std::list<std::string> get_model2d_name_list();
- // extern void init_model2d_map();
- // extern void release_model2d_map();
- extern int get_n_2dmodels();
-
extern model<double,double,std::vector<double>,std::string >& get_1dmodel_by_name(const char*);
- extern model<double,vecn<double,2>,std::vector<double>,std::string >& get_2dmodel_by_name(const char*);
-
- extern strmodel1d& get_strm1d();
+ extern const char* get_model_name(int n);
}