added ObjectInterrution generic class. Failure inherits from it

dream/simulation/CoreObject.py

@@ -26,8 +26,6 @@ Class that acts as an abstract. It should have no instances. All the core-object
 '''
 
 from SimPy.Simulation import Process, Resource
-from SimPy.Simulation import hold, now
-import scipy.stats as stat
 
 #the core object
 class CoreObject(Process):

dream/simulation/Failure.py

@@ -26,12 +26,12 @@ Created on 9 Nov 2012
 models the failures that servers can have
 '''
 
-
 from SimPy.Simulation import *
 import math
 from RandomNumberGenerator import RandomNumberGenerator
+from ObjectInterruption import ObjectInterruption
 
-class Failure(Process):
+class Failure(ObjectInterruption):
     
     def __init__(self, victim, dist, MTTF, MTTR, availability, index, repairman):
         Process.__init__(self)
@@ -122,6 +122,3 @@ class Failure(Process):
                 G.sheetIndex+=1
                 G.traceSheet=G.traceFile.add_sheet('sheet '+str(G.sheetIndex), cell_overwrite_ok=True)
 
-    #outputs data to "output.xls"
-    def outputResultsXL(self, MaxSimtime):
-        pass
\ No newline at end of file

dream/simulation/ObjectInterruption.py

+# ===========================================================================
+# Copyright 2013 Georgios Dagkakis
+#
+# This file is part of DREAM.
+#
+# DREAM is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# DREAM is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with DREAM.  If not, see <http://www.gnu.org/licenses/>.
+# ===========================================================================
+
+'''
+Created on 18 Aug 2013
+
+@author: George
+'''
+'''
+Class that acts as an abstract. It should have no instances. All object interruptions (eg failures, breaks) should inherit from it
+'''
+
+from SimPy.Simulation import Process, Resource
+
+class ObjectInterruption(Process):
+    
+    #the main process of the core object
+    #this is dummy, every object must have its own implementation
+    def run(self):
+        raise NotImplementedError("Subclass must define 'run' method")
+
+    #outputs data to "output.xls"
+    def outputResultsXL(self, MaxSimtime):
+        pass
\ No newline at end of file