Merging with JR_ASV_2_1_0_deb_with_KERNEL_Head branch, which contains many bug fixes...

[modules/superv.git] / src / Supervision / batchmode_SuperV.py

diff --git a/src/Supervision/batchmode_SuperV.py b/src/Supervision/batchmode_SuperV.py
index bdc6441acc5d954ef8bf0bdc3c34ef7bdc60eb6e..6a7067768d68f7d997b9171119a308c37e7c6a6c 100644 (file)
--- a/src/Supervision/batchmode_SuperV.py
+++ b/src/Supervision/batchmode_SuperV.py
@@ -557,14 +557,14 @@ class CNode:
         return self.N.DoneW()
     def SuspendedW( self ):
         return self.N.SuspendedW()
-    def ReRun( self ):
-        return self.N.ReRun()
-    def ReStart( self ):
-        return self.N.ReStart()
-    def ReRunAt( self , aNodeName ):
-        return self.N.ReRunAt( aNodeName )
-    def ReStartAt( self , aNodeName ):
-        return self.N.ReStartAt( aNodeName )
+    #def ReRun( self ):
+    #    return self.N.ReRun()
+    #def ReStart( self ):
+    #    return self.N.ReStart()
+    #def ReRunAt( self , aNodeName ):
+    #    return self.N.ReRunAt( aNodeName )
+    #def ReStartAt( self , aNodeName ):
+    #    return self.N.ReStartAt( aNodeName )
     def Ping( self ):
         return self.N.ping()
     def Kill( self ):
@@ -1257,11 +1257,26 @@ class Graph(GNode):
 class GraphE(Graph):
 ##########################################################
     def __init__( self , aName ):
-        graph = SuperVision.GraphE( aName )
-        self.G = graph
-        self.G.Verbose = 1
-        self.N = graph
-        self.N.Verbose = 1
+        try:
+            graph = SuperVision.GraphE( aName )
+        except:
+            try:
+                graph = aName.G.Copy()
+            except:
+                graph = aName
+        if graph != None :
+            if graph.IsStreamGraph() :
+                aGraph = graph.ToStreamGraph()
+                if aGraph != None :
+                    graph = StreamGraphE( aGraph )
+                else :
+                    print "Graph creation failed"
+            self.G = graph
+            self.G.Verbose = 1
+            self.N = graph
+            self.N.Verbose = 1
+        else :
+            print "Graph creation failed"
     def ToStreamGraph( self ):
         aGraph = self.G.ToStreamGraph()
         if aGraph != None :