From 50e769e8f1a5234c3ca3969088e407d3212e6ce3 Mon Sep 17 00:00:00 2001
From: astrojhgu <astrojhgu@ed2142bd-67ad-457f-ba7c-d818d4011675>
Date: Thu, 20 Jan 2011 17:32:15 +0000
Subject: git-svn-id: file:///home/svn/opt_utilities@165
 ed2142bd-67ad-457f-ba7c-d818d4011675

---
 models/models.hpp | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'models/models.hpp')

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);
 }
 
 
-- 
cgit v1.2.2