Got units conversion working and small edits to restore code runnability:

- Fixed/finished unifyUnits function -- it now (seems to) work...
- Uncommented the call to unifyUnits so it's now applied to vessel yamls.
- action.py: Commented out a syntax issue and made it so that assignObjects
  method doesn't also figure out the required capacities (so that code will
  run, and that could be a separate step anyway).
- Moved the test call to evaluateAssets in Irma.py to later in the script
  after all the actions are set up. More organized order, and lets the
  existing code still run.

Author: mattEhall

famodel/irma/action.py

@@ -331,6 +331,7 @@ def getMetrics(self, cap, met, obj):
             # object logic checked
             vol = 0
             length = 0
+            '''
             if objType == 'cable':
                 for cable in cables: # TODO: figure out this iteration
                     if cable is cable and not other thing in cables object: # TODO figure out how to only check cables, not j-tubes or any other parts
@@ -339,7 +340,7 @@ def getMetrics(self, cap, met, obj):
             else:
                 vol = -1
                 length = -1
-                
+            '''
             # Assign the capabilties metrics
             metrics['volume_m3'] = vol if vol > metrics.get('volume_m3') else metrics.get('volume_m3')
             metrics['cable_capacity_m'] = length if length > metrics.get('cable_capacity_m') else metrics.get('cable_capacity_m')
@@ -760,14 +761,15 @@ def assignObjects(self, objects):
             else:
                 if obj in self.objectList:
                     print(f"Warning: Object '{obj}' is already in the action's object list. Capabilities will be overwritten.")
-
+                '''
                 # Set capability requirements based on object
                 for role, caplist in self.requirements.items():
                     for cap in caplist:
                         metrics = self.getMetrics(cap, caplist[cap], obj) # pass in the metrics dict for the cap and the obj
 
                         self.requirements[role][cap] = metrics  # assign metric of capability cap based on value required by obj
-
+                # MH: commenting our for now just so the code will run, but it may be better to make the above a separate step anyway
+                '''
                 self.objectList.append(obj)
 
 

famodel/irma/irma.py

@@ -110,24 +110,30 @@ def unifyUnits(d):
     # >>> dcopy = deepcopy(d)
 
     for asset in d.values():  # loop through each asset's dict
-        for capability in asset['capabilities'].values():
-            for key, val in capability.items():  # look at each capability metric
+        
+        capabilities = {}  # new dict of capabilities to built up
+        
+        for cap_key, cap_val in asset['capabilities'].items():
+            
+            # make the capability type sub-dictionary
+            capabilities[cap_key] = {}
+        
+            for key, val in cap_val.items():  # look at each capability metric
                 try:
                     i = keys1.index(key)  # find if key is on the list to convert
 
 
-                    if keys2[i] in capability.keys():
+                    if keys2[i] in cap_val.keys():
                         raise Exception(f"Specification '{keys2[i]}' already exists")
 
-                    capability[keys2[i]] = val * facts[i]  # create a new SI entry
-                    
-                    breakpoint()
-                    
-                    del capability[keys1[i]]  # remove the original?
+                    capabilities[cap_key][keys2[i]] = val * facts[i]  # make converted entry
+                    #capability[keys2[i]] = val * facts[i]  # create a new SI entry
+                    #del capability[keys1[i]]  # remove the original?
 
                 except:
-                    print('not found')
-
+                    
+                    capabilities[cap_key][key] = val  # copy over original form
+                 
 
 class Scenario():
 
@@ -144,7 +150,7 @@ def __init__(self):
         vessels = loadYAMLtoDict('vessels.yaml', already_dict=True)
         objects = loadYAMLtoDict('objects.yaml', already_dict=True)
 
-        #unifyUnits(vessels)  # (function doesn't work yet!) <<<
+        unifyUnits(vessels)  # (function doesn't work yet!) <<<
 
         # ----- Validate internal cross references -----
 
@@ -378,7 +384,6 @@ def findCompatibleVessels(self):
 
         # add and register anchor install action(s)
         a1 = sc.addAction('install_anchor', f'install_anchor-{akey}', objects=[anchor])
-        a1.evaluateAssets({'carrier' : sc.vessels["MPSV_01"]})
 
         # register the actions as necessary for the anchor <<< do this for all objects??
         anchor.install_dependencies = [a1]
@@ -436,6 +441,10 @@ def findCompatibleVessels(self):
 
     # ----- Check tasks for suitable vessels and the associated costs/times -----
 
+    # preliminary/temporary test of anchor install asset suitability
+    for akey, anchor in project.anchorList.items():
+        for a in anchor.install_dependencies:  # go through required actions (should just be the anchor install)
+            a.evaluateAssets({'carrier' : sc.vessels["MPSV_01"]})  # see if this example vessel can do it
 
 
     # ----- Call the scheduler -----