Ensemble Model Connections Improvement

framework/Models/EnsembleModel.py

@@ -300,13 +300,6 @@ def initialize(self,runInfo,inputs,initDict=None):
     # construct the ensemble model directed graph
     self.ensembleModelGraph = graphStructure.graphObject(modelsToOutputModels)
     # make some checks
-    # FIXME: the following check is too tight, even if the models are connected, the
-    # code may still raise an error. I think in really, we do not need to raise an error,
-    # maybe a warning is enough. For example:
-    #   a -> b -> c
-    #        ^
-    #        |
-    #   e -> d -> f
     if not self.ensembleModelGraph.isConnectedNet():
       isolatedModels = self.ensembleModelGraph.findIsolatedVertices()
       self.raiseAnError(IOError, "Some models are not connected. Possible candidates are: "+' '.join(isolatedModels))

framework/OutStreams/OutStreamPrint.py

@@ -82,8 +82,8 @@ def localGetInitParams(self):
     for index in range(len(self.sourceName)):
       paramDict['Source Name ' + str(index) + ' :'] = self.sourceName[index]
     if self.what:
-      for index in range(len(self.what)):
-        paramDict['Variable Name ' + str(index) + ' :'] = self.what[index]
+      for index, var in enumerate(self.what.split(',')):
+        paramDict['Variable Name ' + str(index) + ' :'] = var
     return paramDict
 
   def initialize(self, inDict):

framework/utils/graphStructure.py

@@ -24,6 +24,7 @@
 #External Modules------------------------------------------------------------------------------------
 import sys
 import itertools
+import copy
 #External Modules End--------------------------------------------------------------------------------
 #Internal Modules------------------------------------------------------------------------------------
 from utils import utils
@@ -127,7 +128,7 @@ def findIsolatedVertices(self):
       @ In, None
       @ Out, isolated, list, list of isolated nodes (verteces)
     """
-    graph = self.__graphDict
+    graph = self.__extendDictForGraphTheory()
     isolated = []
     for vertex in graph:
       if not graph[vertex]:
@@ -202,52 +203,56 @@ def findAllPaths(self, startVertex, endVertex, path=[]):
           paths.append(p)
     return paths
 
-  def isConnected(self, verticesEncountered = None, startVertex=None):
+  def isConnected(self, graphDict, verticesEncountered = None, startVertex=None):
     """
       Method that determines if the graph is connected (graph theory connectivity)
       @ In, verticesEncountered, set, the encountered vertices (generally it is None when called from outside)
+      @ In, graphDict, dict, the graph dictionary
       @ In, startVertex, string, the starting vertex
       @ Out, isConnected, bool, is the graph fully connected?
     """
     if verticesEncountered is None:
       verticesEncountered = set()
-    gdict = self.__graphDict
-    vertices = list(gdict.keys())
+    vertices = list(graphDict.keys())
     if not startVertex:
       # chosse a vertex from graph as a starting point
       startVertex = vertices[0]
     verticesEncountered.add(startVertex)
     if len(verticesEncountered) != len(vertices):
-      for vertex in gdict[startVertex]:
+      for vertex in graphDict[startVertex]:
         if vertex not in verticesEncountered:
-          if self.isConnected(verticesEncountered, vertex):
+          if self.isConnected(graphDict, verticesEncountered, vertex):
             return True
     else:
       return True
     return False
 
-  def isConnectedNet(self, startVertex=None):
+  def isConnectedNet(self):
     """
       Method that determines if the graph is a connected net (all the vertices are connect with each other through other vertices)
-      This method can state that we have a connected net even if, based on graph theory, the graph is not connected
-      @ In, startVertex, string, the starting vertex
+      @ In, None
       @ Out, graphNetConnected, bool, is the graph net fully connected?
     """
-    graphNetConnected = self.isConnected()
-    if graphNetConnected:
-      return graphNetConnected
-    # the graph is not connected (Graph theory)
-    uniquePaths = self.findAllUniquePaths()
-    # now check if there is at list a node that is common in all the paths
-    if len(uniquePaths) > 0:
-      graphNetConnected = True
-      startPath = set(uniquePaths.pop())
-      for otherPath in uniquePaths:
-        if startPath.isdisjoint(otherPath):
-          graphNetConnected = False
-          break
+    graphDict = self.__extendDictForGraphTheory()
+    graphNetConnected = self.isConnected(graphDict)
     return graphNetConnected
 
+  def __extendDictForGraphTheory(self):
+    """
+      Method to extend the graph dictionary in order to be accepted by the graph theory
+      @ In, None
+      @ Out, graphDict, dict, the extended graph dictionary, used for isConnectedNet and findIsolatedVertices
+    """
+    graphDict = copy.deepcopy(self.__graphDict)
+    # Extend graph dictionary generated by ensemble model to graph theory acceptable dictionary
+    # Basicly, if a -> b (a is connected to b), the self.__graphDict = {'a':['b'], 'b':[]}
+    # Since a is connected to b, from the graph theory, the dictionary should become {'a':['b'], 'b':['a']}
+    for inModel, outModelList in self.__graphDict.items():
+      for outModel in outModelList:
+        if inModel not in graphDict[outModel]:
+          graphDict[outModel].append(inModel)
+    return graphDict
+
   def findAllUniquePaths(self, startVertices=None):
     """
       This method finds all the unique paths in the graph

tests/framework/ensembleModelTests/checkConnection/alpha.py

@@ -0,0 +1,28 @@
+# Copyright 2017 Battelle Energy Alliance, LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import numpy as np
+import copy
+import time
+# CAUTION HERE #
+# IT IS IMPORTANT THAT THE USER IS AWARE THAT THE EXTERNAL MODEL (RUN METHOD)
+# NEEDS TO BE THREAD-SAFE!!!!!
+# IN CASE IT IS NOT, THE USER NEEDS TO SET A LOCK SYSTEM!!!!!
+import threading
+localLock = threading.RLock()
+
+def initialize(self, runInfo, inputs):
+  pass
+
+def run(self, Input):
+  self.C = self.A + self.B

tests/framework/ensembleModelTests/checkConnection/beta.py

@@ -0,0 +1,28 @@
+# Copyright 2017 Battelle Energy Alliance, LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import numpy as np
+import copy
+import time
+# CAUTION HERE #
+# IT IS IMPORTANT THAT THE USER IS AWARE THAT THE EXTERNAL MODEL (RUN METHOD)
+# NEEDS TO BE THREAD-SAFE!!!!!
+# IN CASE IT IS NOT, THE USER NEEDS TO SET A LOCK SYSTEM!!!!!
+import threading
+localLock = threading.RLock()
+
+def initialize(self, runInfo, inputs):
+  pass
+
+def run(self, Input):
+  self.E = self.C - self.D + 1.0

tests/framework/ensembleModelTests/checkConnection/delta.py

@@ -0,0 +1,28 @@
+# Copyright 2017 Battelle Energy Alliance, LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import numpy as np
+import copy
+import time
+# CAUTION HERE #
+# IT IS IMPORTANT THAT THE USER IS AWARE THAT THE EXTERNAL MODEL (RUN METHOD)
+# NEEDS TO BE THREAD-SAFE!!!!!
+# IN CASE IT IS NOT, THE USER NEEDS TO SET A LOCK SYSTEM!!!!!
+import threading
+localLock = threading.RLock()
+
+def initialize(self, runInfo, inputs):
+  pass
+
+def run(self, Input):
+  self.F = self.E + 1.0

tests/framework/ensembleModelTests/checkConnection/epsilon.py

@@ -0,0 +1,28 @@
+# Copyright 2017 Battelle Energy Alliance, LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import numpy as np
+import copy
+import time
+# CAUTION HERE #
+# IT IS IMPORTANT THAT THE USER IS AWARE THAT THE EXTERNAL MODEL (RUN METHOD)
+# NEEDS TO BE THREAD-SAFE!!!!!
+# IN CASE IT IS NOT, THE USER NEEDS TO SET A LOCK SYSTEM!!!!!
+import threading
+localLock = threading.RLock()
+
+def initialize(self, runInfo, inputs):
+  pass
+
+def run(self, Input):
+  self.G = self.H + 3.0

tests/framework/ensembleModelTests/checkConnection/gamma.py

@@ -0,0 +1,28 @@
+# Copyright 2017 Battelle Energy Alliance, LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import numpy as np
+import copy
+import time
+# CAUTION HERE #
+# IT IS IMPORTANT THAT THE USER IS AWARE THAT THE EXTERNAL MODEL (RUN METHOD)
+# NEEDS TO BE THREAD-SAFE!!!!!
+# IN CASE IT IS NOT, THE USER NEEDS TO SET A LOCK SYSTEM!!!!!
+import threading
+localLock = threading.RLock()
+
+def initialize(self, runInfo, inputs):
+  pass
+
+def run(self, Input):
+  self.D = self.G + 1.0

tests/framework/ensembleModelTests/checkConnection/rho.py

@@ -0,0 +1,28 @@
+# Copyright 2017 Battelle Energy Alliance, LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import numpy as np
+import copy
+import time
+# CAUTION HERE #
+# IT IS IMPORTANT THAT THE USER IS AWARE THAT THE EXTERNAL MODEL (RUN METHOD)
+# NEEDS TO BE THREAD-SAFE!!!!!
+# IN CASE IT IS NOT, THE USER NEEDS TO SET A LOCK SYSTEM!!!!!
+import threading
+localLock = threading.RLock()
+
+def initialize(self, runInfo, inputs):
+  pass
+
+def run(self, Input):
+  self.I = self.D - 1.0