From 0fbc0910e11c5ab3e456ac940edd03f70db54a59 Mon Sep 17 00:00:00 2001
From: "Joshua J. Cogliati" <joshua.cogliati@inl.gov>
Date: Tue, 1 Mar 2022 14:02:53 -0700
Subject: [PATCH 1/6] Fixing imports.

---
 __init__.py            | 10 +++++-----
 src/CashFlow_ExtMod.py |  8 ++++----
 src/CashFlows.py       |  8 ++++----
 src/main.py            |  6 +++---
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/__init__.py b/__init__.py
index 97bee22b6..347544412 100644
--- a/__init__.py
+++ b/__init__.py
@@ -13,8 +13,8 @@
 # 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.
-from TEAL.src import Amortization
-from TEAL.src import CashFlow_ExtMod
-from TEAL.src import CashFlows
-from TEAL.src import CashFlowUser
-from TEAL.src import main as CashFlow
+from .src import Amortization
+from .src import CashFlow_ExtMod
+from .src import CashFlows
+from .src import CashFlowUser
+from .src import main as CashFlow
diff --git a/src/CashFlow_ExtMod.py b/src/CashFlow_ExtMod.py
index 4881549d3..9c63627d5 100644
--- a/src/CashFlow_ExtMod.py
+++ b/src/CashFlow_ExtMod.py
@@ -27,8 +27,8 @@
 
 # NOTE this import exception is ONLY to allow RAVEN to directly import this module.
 try:
-  from TEAL.src import main
-  from TEAL.src import CashFlows
+  from ..src import main
+  from ..src import CashFlows
 except ImportError:
   import main
 
@@ -41,8 +41,8 @@
 sys.path.append(os.path.expanduser(ravenPath))
 
 try:
-  from utils.graphStructure import graphObject
-  from PluginBaseClasses.ExternalModelPluginBase import ExternalModelPluginBase
+  from framework.utils.graphStructure import graphObject
+  from framework.PluginBaseClasses.ExternalModelPluginBase import ExternalModelPluginBase
 except:
   raise IOError("CashFlow ERROR (Initialisation): RAVEN needs to be installed and CashFlow needs to be in its plugin directory for the plugin to work!'")
 
diff --git a/src/CashFlows.py b/src/CashFlows.py
index 4d9e8a2fa..a826ae08e 100644
--- a/src/CashFlows.py
+++ b/src/CashFlows.py
@@ -36,14 +36,14 @@
   import Amortization
 # TODO fix with plugin relative path
 path1 = os.path.dirname(__file__)
-path2 = '/../raven/framework'
+path2 = '/../raven'
 path3=os.path.abspath(os.path.expanduser(path1+'/..'+path2))
 path4=os.path.abspath(os.path.expanduser(path1+path2))
-path5=os.path.abspath(os.path.expanduser(path1+'/../../../framework'))
+path5=os.path.abspath(os.path.expanduser(path1+'/../../..'))
 sys.path.extend([path3,path4,path5])
 
-from utils import mathUtils as utils
-from utils import InputData, InputTypes, TreeStructure, xmlUtils
+from framework.utils import mathUtils as utils
+from framework.utils import InputData, InputTypes, TreeStructure, xmlUtils
 
 
 class GlobalSettings:
diff --git a/src/main.py b/src/main.py
index b16a36ebe..da7d73d8b 100644
--- a/src/main.py
+++ b/src/main.py
@@ -27,7 +27,7 @@
 import numpy as np
 import numpy_financial as npf
 try:
-  from TEAL.src import CashFlows
+  from ..src import CashFlows
   # NOTE this import exception is ONLY to allow RAVEN to directly import this extmod.
   # In general, this should not exist, and RAVEN should import TEAL.CashFlow instead of importing Teal directly, implicitly.
 except (ImportError, ModuleNotFoundError):
@@ -36,8 +36,8 @@
 raven_path= os.path.abspath(os.path.dirname(__file__)) + '/../../raven/framework'
 sys.path.append(raven_path) #'~/projects/raven/framework') # TODO generic RAVEN location
 
-from utils.graphStructure import graphObject
-from utils import mathUtils as utils
+from framework.utils.graphStructure import graphObject
+from framework.utils import mathUtils as utils
 
 #=====================
 # UTILITIES

From 61a9a51bccf3f1b1157137fc690eb2ace96e59ea Mon Sep 17 00:00:00 2001
From: "Joshua J. Cogliati" <joshua.cogliati@inl.gov>
Date: Tue, 1 Mar 2022 16:03:23 -0700
Subject: [PATCH 2/6] Simplifying imports.

---
 src/CashFlowUser.py               |  7 +-----
 src/CashFlow_ExtMod.py            | 13 ++--------
 src/CashFlows.py                  | 40 +++++++++++--------------------
 src/main.py                       | 17 ++++---------
 tests/HourlyObjectOrientedTest.py |  3 ++-
 5 files changed, 24 insertions(+), 56 deletions(-)

diff --git a/src/CashFlowUser.py b/src/CashFlowUser.py
index 6b23c6064..dda228687 100644
--- a/src/CashFlowUser.py
+++ b/src/CashFlowUser.py
@@ -22,15 +22,10 @@
 import os
 import sys
 
-# NOTE this import exception is ONLY to allow RAVEN to directly import this module.
-try:
-  from TEAL.src.CashFlows import Component
-except ImportError:
-  from CashFlows import Component
+from ..src.CashFlows import Component
 
 # This plugin imports RAVEN modules. if run in stand-alone, RAVEN needs to be installed and this file
 # needs to be in the propoer plugin directory.
-sys.path.append(os.path.expanduser(os.path.dirname(__file__) + '/../../../framework'))
 
 class CashFlowUser:
   """
diff --git a/src/CashFlow_ExtMod.py b/src/CashFlow_ExtMod.py
index 9c63627d5..c1a9457cc 100644
--- a/src/CashFlow_ExtMod.py
+++ b/src/CashFlow_ExtMod.py
@@ -25,20 +25,11 @@
 import warnings
 warnings.simplefilter('default', DeprecationWarning)
 
-# NOTE this import exception is ONLY to allow RAVEN to directly import this module.
-try:
-  from ..src import main
-  from ..src import CashFlows
-except ImportError:
-  import main
-
+from ..src import main
+from ..src import CashFlows
 
 # This plugin imports RAVEN modules. if run in stand-alone, RAVEN needs to be installed and this file
 # needs to be in the propoer plugin directory.
-dirPath = os.path.dirname(os.path.realpath(__file__))
-# TODO fix with plugin relative path
-ravenPath = os.path.dirname(__file__) + '/../../../framework'
-sys.path.append(os.path.expanduser(ravenPath))
 
 try:
   from framework.utils.graphStructure import graphObject
diff --git a/src/CashFlows.py b/src/CashFlows.py
index a826ae08e..bcbba96f5 100644
--- a/src/CashFlows.py
+++ b/src/CashFlows.py
@@ -29,22 +29,10 @@
 import numpy as np
 import time
 
-# NOTE this import exception is ONLY to allow RAVEN to directly import this module.
-try:
-  from TEAL.src import Amortization
-except ImportError:
-  import Amortization
-# TODO fix with plugin relative path
-path1 = os.path.dirname(__file__)
-path2 = '/../raven'
-path3=os.path.abspath(os.path.expanduser(path1+'/..'+path2))
-path4=os.path.abspath(os.path.expanduser(path1+path2))
-path5=os.path.abspath(os.path.expanduser(path1+'/../../..'))
-sys.path.extend([path3,path4,path5])
-
-from framework.utils import mathUtils as utils
-from framework.utils import InputData, InputTypes, TreeStructure, xmlUtils
+from ..src import Amortization
 
+from framework.utils import mathUtils
+from framework.utils import InputData, InputTypes, TreeStructure, xmlUtils
 
 class GlobalSettings:
   """
@@ -839,13 +827,13 @@ def setVariableOrFloats(self, value):
     if len(value) == 1:
       # single entry should be either a float (price) or string (raven variable)
       value = value[0]
-      if utils.isAString(value) or utils.isAFloatOrInt(value):
+      if mathUtils.isAString(value) or mathUtils.isAFloatOrInt(value):
         ret = value
       else:
         raise IOError('Unrecognized alpha/driver type: "{}" with type "{}"'.format(value, type(value)))
     else:
       # should be floats; InputData assures the entries are the same type already
-      if not utils.isAFloatOrInt(value[0]):
+      if not mathUtils.isAFloatOrInt(value[0]):
         raise IOError('Multiple non-number entries for alpha/driver found, but require either a single variable name or multiple float entries: {}'.format(value))
       ret = np.asarray(value)
     return ret
@@ -861,7 +849,7 @@ def loadFromVariables(self, need, variables, cashflows, lifetime):
     """
     # load variable values from variables or other cash flows, as needed (ha!)
     for name, source in need.items():
-      if utils.isAString(source):
+      if mathUtils.isAString(source):
         # as a string, this is either from the variables or other cashflows
         # look in variables first
         value = variables.get(source, None)
@@ -1011,7 +999,7 @@ def extendParameters(self, toExtend, t):
     # for capex, both the Driver and Alpha are nonzero in year 1 and zero thereafter
     for name, value in toExtend.items():
       if name.lower() in ['alpha', 'driver']:
-        if utils.isAFloatOrInt(value) or (len(value) == 1 and utils.isAFloatOrInt(value[0])):
+        if mathUtils.isAFloatOrInt(value) or (len(value) == 1 and mathUtils.isAFloatOrInt(value[0])):
           new = np.zeros(t)
           new[0] = float(value)
           toExtend[name] = new
@@ -1043,7 +1031,7 @@ def calculateCashflow(self, variables, lifetimeCashflows, lifetime, verbosity):
     mult = self.getMultiplier()
     if mult is None:
       mult = 1.0
-    elif utils.isAString(mult):
+    elif mathUtils.isAString(mult):
       mult = float(variables[mult])
     result = mult * alpha * (driver / reference) ** scale
     if verbosity > 1:
@@ -1067,7 +1055,7 @@ def checkParamLengths(self, lifetime, compName=None):
     for param in ['alpha', 'driver']:
       val = self.getParam(param)
       # if a string, then it's probably a variable, so don't check it now
-      if utils.isAString(val):
+      if mathUtils.isAString(val):
         continue
       # if it's valued, then it better be the same length as the lifetime (which is comp lifetime + 1)
       elif len(val) != lifetime:
@@ -1132,7 +1120,7 @@ def computeIntrayearCashflow(self, year, alpha, driver):
     mult = self.getMultiplier()
     if mult is None:
       mult = 1.0
-    elif utils.isAString(mult):
+    elif mathUtils.isAString(mult):
       raise NotImplementedError
     try:
       self._yearlyCashflow[year] = mult * (alpha * driver).sum() # +1 is for initial construct year
@@ -1153,7 +1141,7 @@ def computeYearlyCashflow(self, alpha, driver):
     mult = self.getMultiplier()
     if mult is None:
       mult = 1.0
-    elif utils.isAString(mult):
+    elif mathUtils.isAString(mult):
       raise NotImplementedError
     try:
       self._yearlyCashflow = mult * (alpha * driver)
@@ -1201,7 +1189,7 @@ def extendParameters(self, toExtend, t):
     # FIXME: we're going to integrate alpha * D over time (not year time, intrayear time)
     for name, value in toExtend.items():
       if name.lower() in ['alpha']:
-        if utils.isAFloatOrInt(value) or (len(value) == 1 and utils.isAFloatOrInt(value[0])):
+        if mathUtils.isAFloatOrInt(value) or (len(value) == 1 and mathUtils.isAFloatOrInt(value[0])):
           new = np.ones(t) * float(value)
           new[0] = 0
           toExtend[name] = new
@@ -1224,12 +1212,12 @@ def extendParameters(self, toExtend, t):
     driver = toExtend['driver']
     # how we treat the driver depends on if this is the amortizer or the depreciator
     if self.name.split('_')[-2] == 'amortize':
-      if not utils.isAString(driver):
+      if not mathUtils.isAString(driver):
         toExtend['driver'] = np.ones(t) * driver[0] * -1.0
         toExtend['driver'][0] = 0.0
       for name, value in toExtend.items():
         if name.lower() in ['driver']:
-          if utils.isAFloatOrInt(value) or (len(value) == 1 and utils.isAFloatOrInt(value[0])):
+          if mathUtils.isAFloatOrInt(value) or (len(value) == 1 and mathUtils.isAFloatOrInt(value[0])):
             new = np.zeros(t)
             new[1:] = float(value)
             toExtend[name] = new
diff --git a/src/main.py b/src/main.py
index da7d73d8b..4f1c08900 100644
--- a/src/main.py
+++ b/src/main.py
@@ -26,18 +26,11 @@
 
 import numpy as np
 import numpy_financial as npf
-try:
-  from ..src import CashFlows
-  # NOTE this import exception is ONLY to allow RAVEN to directly import this extmod.
-  # In general, this should not exist, and RAVEN should import TEAL.CashFlow instead of importing Teal directly, implicitly.
-except (ImportError, ModuleNotFoundError):
-  import CashFlows
 
-raven_path= os.path.abspath(os.path.dirname(__file__)) + '/../../raven/framework'
-sys.path.append(raven_path) #'~/projects/raven/framework') # TODO generic RAVEN location
+from ..src import CashFlows
 
 from framework.utils.graphStructure import graphObject
-from framework.utils import mathUtils as utils
+from framework.utils import mathUtils
 
 #=====================
 # UTILITIES
@@ -140,7 +133,7 @@ def _createEvalProcess(components, variables):
       # does the driver come from the variable list, or from another cashflow, or is it already evaluated?
       cfn = '{}|{}'.format(comp.name, cf.name)
       found = False
-      if driver is None or utils.isAFloatOrInt(driver) or isinstance(driver, np.ndarray):
+      if driver is None or mathUtils.isAFloatOrInt(driver) or isinstance(driver, np.ndarray):
         found = True
         # TODO assert it's already filled?
         evaluated.append(cfn)
@@ -213,11 +206,11 @@ def componentLifeCashflow(comp, cf, variables, lifetimeCashflows, v=100):
     for item, value in results.items():
       if item == 'result':
         continue
-      if utils.isAFloatOrInt(value):
+      if mathUtils.isAFloatOrInt(value):
         vprint(v, 1, m, paramText.format(item, value))
       else:
         orig = cf.getParam(item)
-        if utils.isSingleValued(orig):
+        if mathUtils.isSingleValued(orig):
           name = orig
         else:
           name = '(from input)'
diff --git a/tests/HourlyObjectOrientedTest.py b/tests/HourlyObjectOrientedTest.py
index 0df27f7a2..b6b4b74ff 100644
--- a/tests/HourlyObjectOrientedTest.py
+++ b/tests/HourlyObjectOrientedTest.py
@@ -23,7 +23,8 @@
 import sys
 import numpy as np
 import pandas as pd
-sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..')))
+sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))) #Plugins (including TEAL)
+sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', '..'))) #RAVEN
 from TEAL import CashFlows
 from TEAL import CashFlow as RunCashFlow
 

From e4e95d378ad3a74f2726e104101566917153c300 Mon Sep 17 00:00:00 2001
From: "Joshua J. Cogliati" <joshua.cogliati@inl.gov>
Date: Tue, 1 Mar 2022 16:51:40 -0700
Subject: [PATCH 3/6] Fixing bug from merge.

---
 src/CashFlows.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CashFlows.py b/src/CashFlows.py
index 771b87114..086539fe6 100644
--- a/src/CashFlows.py
+++ b/src/CashFlows.py
@@ -1011,7 +1011,7 @@ def extendParameters(self, toExtend, t):
           toExtend[name] = new
         elif type(value) in [list, np.ndarray]:
           if len(value) == 1:
-            if utils.isAFloatOrInt(value[0]):
+            if mathUtils.isAFloatOrInt(value[0]):
               new = np.zeros(t)
               new[0] = float(value)
               toExtend[name] = new
@@ -1223,7 +1223,7 @@ def extendParameters(self, toExtend, t):
           toExtend[name] = new
         elif type(value) in [list, np.ndarray]:
           if len(value) == 1:
-            if utils.isAFloatOrInt(value[0]):
+            if mathUtils.isAFloatOrInt(value[0]):
               new = np.ones(t) * float(value)
               new[0] = 0
               toExtend[name] = new

From 1e37a1191699d8090a6fadd6ea2b71a23d87ffd8 Mon Sep 17 00:00:00 2001
From: "Joshua J. Cogliati" <joshua.cogliati@inl.gov>
Date: Wed, 2 Mar 2022 08:58:08 -0700
Subject: [PATCH 4/6] Skipping CashFlow_NPV_RunAsCode until driver created.

---
 tests/tests | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/tests b/tests/tests
index fd975113a..5c4806fca 100644
--- a/tests/tests
+++ b/tests/tests
@@ -58,6 +58,7 @@
  [./CashFlow_NPV_RunAsCode]
   type = 'RavenPython'
   input = 'CashFlow_test_NPV_RunAsCode.py'
+  skip = 'Need to create driver to make this work'
  [../]
 
  [./CashFlow_NPV_customTime]

From 2e583e2dec2ae463e83dfd9aa5ff604324f40b94 Mon Sep 17 00:00:00 2001
From: "Joshua J. Cogliati" <joshua.cogliati@inl.gov>
Date: Tue, 15 Mar 2022 10:55:47 -0600
Subject: [PATCH 5/6] Switching to ravenframework.

---
 src/CashFlow_ExtMod.py | 4 ++--
 src/CashFlows.py       | 4 ++--
 src/main.py            | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/CashFlow_ExtMod.py b/src/CashFlow_ExtMod.py
index c1a9457cc..4ba222b3a 100644
--- a/src/CashFlow_ExtMod.py
+++ b/src/CashFlow_ExtMod.py
@@ -32,8 +32,8 @@
 # needs to be in the propoer plugin directory.
 
 try:
-  from framework.utils.graphStructure import graphObject
-  from framework.PluginBaseClasses.ExternalModelPluginBase import ExternalModelPluginBase
+  from ravenframework.utils.graphStructure import graphObject
+  from ravenframework.PluginBaseClasses.ExternalModelPluginBase import ExternalModelPluginBase
 except:
   raise IOError("CashFlow ERROR (Initialisation): RAVEN needs to be installed and CashFlow needs to be in its plugin directory for the plugin to work!'")
 
diff --git a/src/CashFlows.py b/src/CashFlows.py
index 086539fe6..719c4a23e 100644
--- a/src/CashFlows.py
+++ b/src/CashFlows.py
@@ -31,8 +31,8 @@
 
 from ..src import Amortization
 
-from framework.utils import mathUtils
-from framework.utils import InputData, InputTypes, TreeStructure, xmlUtils
+from ravenframework.utils import mathUtils
+from ravenframework.utils import InputData, InputTypes, TreeStructure, xmlUtils
 
 class GlobalSettings:
   """
diff --git a/src/main.py b/src/main.py
index c03a7d659..9fab34396 100644
--- a/src/main.py
+++ b/src/main.py
@@ -30,8 +30,8 @@
 
 from ..src import CashFlows
 
-from framework.utils.graphStructure import graphObject
-from framework.utils import mathUtils
+from ravenframework.utils.graphStructure import graphObject
+from ravenframework.utils import mathUtils
 
 #=====================
 # UTILITIES

From e8132beb1c944541be59f04da91dd2a3b4cf14b5 Mon Sep 17 00:00:00 2001
From: "Joshua J. Cogliati" <joshua.cogliati@inl.gov>
Date: Thu, 31 Mar 2022 12:36:17 -0600
Subject: [PATCH 6/6] Allow installing TEAL and RAVEN in same directory.

---
 tests/HourlyObjectOrientedTest.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/HourlyObjectOrientedTest.py b/tests/HourlyObjectOrientedTest.py
index b1c5f7528..3f525cab9 100644
--- a/tests/HourlyObjectOrientedTest.py
+++ b/tests/HourlyObjectOrientedTest.py
@@ -25,6 +25,7 @@
 import pandas as pd
 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))) #Plugins (including TEAL)
 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', '..'))) #RAVEN
+sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', 'raven'))) #RAVEN (if TEAL and RAVEN in same directory)
 from TEAL import CashFlows
 from TEAL import CashFlow as RunCashFlow