[oMetah-devel] ometah/experiment metahtest.py

[Jean-Philippe Aumasson]

CVSROOT:        /cvsroot/ometah
Module name:    ometah
Branch:         
Changes by:     Jean-Philippe Aumasson <address@hidden> 05/06/09 15:36:10

Modified files:
        experiment     : metahtest.py 

Log message:
        * added parser for header infos

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/ometah/ometah/experiment/metahtest.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: ometah/experiment/metahtest.py
diff -u ometah/experiment/metahtest.py:1.10 ometah/experiment/metahtest.py:1.11
--- ometah/experiment/metahtest.py:1.10 Thu Jun  9 14:38:56 2005
+++ ometah/experiment/metahtest.py      Thu Jun  9 15:36:10 2005
@@ -69,6 +69,7 @@
 
 D privater les méthodes non publiques ( add __ )
 
+passer directements les coodronnées lues en float, au lieu de le faire au 
plotting -> économies de float()
 
 /----
 
@@ -173,14 +174,51 @@
             return self.__header__
         self.__header__ = Header()
 
-        # 1 remplir problem, et l'instancier avant
+        # Exceptions !
 
+        # 1 remplir problem, et l'instancier avant
+        probl = self.__getRootElement().getElementsByTagName('problem')[0]
+        self.__header__.problem.key = 
self.__getText(probl.getElementsByTagName('key')[0])
+        self.__header__.problem.name = 
self.__getText(probl.getElementsByTagName('name')[0])
+        self.__header__.problem.description = 
self.__getText(probl.getElementsByTagName('description')[0])
+        self.__header__.problem.dimension = 
int(self.__getText(probl.getElementsByTagName('dimension')[0]))
+        self.__header__.problem.reference = 
self.__getText(probl.getElementsByTagName('reference')[0])
+        optimums = probl.getElementsByTagName('optimums')[0]
+        for point in optimums.getElementsByTagName('point'):
+            if point.nodeType == point.ELEMENT_NODE:
+                p = Point()
+                p.value = 
self.__getText(point.getElementsByTagName('values')[0])
+                p.coords = 
self.__getList(point.getElementsByTagName('solution'))
+                self.__header__.problem.optimum.append(p)
+        bounds = probl.getElementsByTagName('bounds')[0]
+        mini = bounds.getElementsByTagName('minimums')[0]
+        for point in mini.getElementsByTagName('point'):
+            if point.nodeType == point.ELEMENT_NODE:
+                p = Point()
+                p.coords = 
self.__getList(point.getElementsByTagName('solution'))
+                self.__header__.problem.min_bound.append(p)
+        maxi = bounds.getElementsByTagName('maximums')[0]        
+        for point in maxi.getElementsByTagName('point'):
+            if point.nodeType == point.ELEMENT_NODE:
+                p = Point()
+                p.coords = 
self.__getList(point.getElementsByTagName('solution'))
+                self.__header__.problem.min_bound.append(p)
+        
         # 2 idem pour metaheur
+        metah = 
self.__getRootElement().getElementsByTagName('metaheuristic')[0]
+        self.__header__.metah.key = 
self.__getText(metah.getElementsByTagName('key')[0])
+        self.__header__.metah.name = 
self.__getText(metah.getElementsByTagName('name')[0])
+        self.__header__.metah.family = 
self.__getText(metah.getElementsByTagName('family')[0])
+        self.__header__.metah.acronym = 
self.__getText(metah.getElementsByTagName('accronym')[0])
+        self.__header__.metah.description = 
self.__getText(metah.getElementsByTagName('description')[0])
+        self.__header__.metah.reference = 
self.__getText(metah.getElementsByTagName('reference')[0])
+
 
     
 class Problem:
     """ descriptive informations of a problem
     only public attributes, descriptive class..."""
+
     key = None
     name = None
     description = None
@@ -212,18 +250,13 @@
 class Header:
     """ for additional informations in XML file """
 
-    __problem = Problem()
-    __metah = Metaheuristic()
+    problem = None
+    metah = None
         
     def __init__(self):
-        pass
-
-    def getProblem(self):
-        return self.__problem
-
-    def getMetah(self):
-        return self.__metah
-
+        problem = Problem()
+        metah = Metaheuristic()
+    
     def toString(self):
         """ to generate a file name for the interface """
         s = self.__problem.name + "_" + self.__metah.name;
@@ -298,6 +331,9 @@
     pointsList = parser.getPoints()
     intfc.log('getting points list : getPoints() ...  OK\n')
 
+    # TODO
+    #header = parser.getHeader()
+    #print header.toString()
 
     intfc.setBitmapOutput(filename = 'valuesDistribHist')    
     intfc.plotValuesIterationsDistribHist(pointsList, __HIST_BREAKS)