change operator shift log to CausalSimple module

Author: wangcj05

src/dackar/causal/OperatorShiftLogsProcessing.py renamed to src/dackar/causal/CausalSimple.py

@@ -50,7 +50,7 @@
 if not Token.has_extension('edep'):
   Token.set_extension("edep", default=None)
 
-class OperatorShiftLogs(CausalBase):
+class CausalSimple(CausalBase):
   """
     Class to process OPG Operator Shift Logs dataset
   """

src/dackar/validate.py

@@ -173,7 +173,7 @@
             "type": {
               "type": "string",
               "description": "Type of causal analysis",
-              "enum": ["general", "phrase", "osl"]
+              "enum": ["general", "phrase", "simple"]
             }
           },
           "additionalProperties": False

src/dackar/workflows/WorkflowManager.py

@@ -48,7 +48,7 @@
 
 from ..causal.CausalSentence import CausalSentence
 from ..causal.CausalPhrase import CausalPhrase
-from ..causal.OperatorShiftLogsProcessing import OperatorShiftLogs
+from ..causal.CausalSimple import CausalSimple
 from .. import config as defaultConfig
 
 from ..validate import validateToml
@@ -365,8 +365,8 @@ def causal(self):
         matcher = CausalSentence(self._nlp, entID=self._entId, causalKeywordID=self._causalID)
       elif method == 'phrase':
         matcher = CausalPhrase(self._nlp, entID=self._entId, causalKeywordID=self._causalID)
-      elif method == 'osl':
-        matcher = OperatorShiftLogs(self._nlp, entID=self._entId, causalKeywordID=self._causalID)
+      elif method == 'simple':
+        matcher = CausalSimple(self._nlp, entID=self._entId, causalKeywordID=self._causalID)
       else:
         raise IOError(f'Unrecognized causal type {method}')
       matcher.addEntityPattern(self._entPatternName, self._patterns)

system_tests/dackar.toml

@@ -42,7 +42,7 @@ emergent_activity = true
 conjecture = true
 
 [nlp.causal]
-type = 'general' # other options: general: "rule based method", wo: "work order", osl: "operator shift log"
+type = 'general' # other options: general: "rule based method", phrase: "short phrase like work order data", simple: "simple causal analysis"
 
 [nlp.outputs]
 csv = true

tests/causal/test_causal.py

@@ -1,5 +1,5 @@
 from dackar.causal.CausalSentence import CausalSentence
-from dackar.causal.OperatorShiftLogsProcessing import OperatorShiftLogs
+from dackar.causal.CausalSimple import CausalSimple
 from dackar.causal.CausalPhrase import CausalPhrase
 from dackar.config import nlpConfig
 from dackar.utils.nlp.nlp_utils import generatePatternList
@@ -45,10 +45,10 @@ def processCausalEnt(self):
   def get_matcher(self, method):
     if method == 'general':
       matcher = CausalSentence(self.nlp, entID=self.entId, causalKeywordID=self.causalID)
-    elif method == 'wo':
+    elif method == 'phrase':
       matcher = CausalPhrase(self.nlp, entID=self.entId, causalKeywordID=self.causalID)
-    elif method == 'osl':
-      matcher = OperatorShiftLogs(self.nlp, entID=self.entId, causalKeywordID=self.causalID)
+    elif method == 'simple':
+      matcher = CausalSimple(self.nlp, entID=self.entId, causalKeywordID=self.causalID)
     else:
       raise IOError(f'Unrecognized causal type {method}')
     patterns = self.generatePattern()
@@ -71,7 +71,7 @@ def test_general(self):
 
 
   def test_wo(self):
-    matcher = self.get_matcher(method='wo')
+    matcher = self.get_matcher(method='phrase')
     matcher(self.doc)
     df = matcher.getAttribute('entStatus')
     dfCausal = matcher.getAttribute('relationGeneral')
@@ -84,7 +84,7 @@ def test_wo(self):
     assert dfCausal['object'].tolist()[0] == 'shaft'
 
   def test_osl(self):
-    matcher = self.get_matcher(method='osl')
+    matcher = self.get_matcher(method='simple')
     matcher(self.doc)
     df = matcher.getAttribute('entStatus')
     dfCausal = matcher.getAttribute('relationGeneral')