[oMetah-devel] ometah/experiment metahtest.py test.sh

[Jean-Philippe Aumasson]

CVSROOT:        /cvsroot/ometah
Module name:    ometah
Branch:         
Changes by:     Jean-Philippe Aumasson <address@hidden> 05/06/06 12:06:07

Modified files:
        experiment     : metahtest.py 
Removed files:
        experiment     : test.sh 

Log message:
        * test.sh removed...

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

Patches:
Index: ometah/experiment/metahtest.py
diff -u ometah/experiment/metahtest.py:1.1 ometah/experiment/metahtest.py:1.2
--- ometah/experiment/metahtest.py:1.1  Mon Jun  6 11:48:46 2005
+++ ometah/experiment/metahtest.py      Mon Jun  6 12:06:07 2005
@@ -54,7 +54,9 @@
 import string
 from rpy import *
 
-OMETAH_PATH = "ometah/ometah"
+OMETAH_PATH = "../ometah"
+OMETAH_OUT = "temp"
+R_OUT = "results.ps"
 
 
 
@@ -77,11 +79,15 @@
         """ constructor, from command line arguments """
         self.argv = [''] + args[1:]
     
-    def execOmetah(self):
-        """ execute ometah with given arguments """
-        os.execv(OMETAH_PATH, self.argv)
+    def execOmetah(self, path, output):
+        """ execute ometah with given arguments,
+        redirecting output to the file output"""
+        buf = sys.stdout
+        sys.stdout = open(output, 'w')
+        os.execv(path, self.argv)
+        sys.stdout = buf
+        
 
-    
     def setAttributes():
         """ set class attributes from XML parsing """
         dimension = 1
@@ -114,27 +120,16 @@
 
 
 
-set_output('test.ps')
+set_output(R_OUT)
 
 main = Interface(sys.argv)
-main.plot()
-
-# commented for now...will generate an XML output file
-# main.exec_ometah()
-
-r.dev_off()
 
+main.execOmetah(OMETAH_PATH, OMETAH_OUT)
 
+# main.plot()
 
+r.dev_off()
 
-"""
-f = open(file_src, 'r')
 
-line = f.readline()
 
-values = line.split()
 
-r.bitmap(file_out, res=200)
-r.plot(values[0], values[1], col="red")
-r.dev_off() 
-"""