Merge branch 'dev' into 13-clarifying-environment-setup-in-readme

Max added a new function to the dev branch, so updaing this feature branch to include that.

ModularCirc/Analysis/BaseAnalysis.py

@@ -228,9 +228,9 @@ def compute_cardiac_output(self, component:str)->float:
         
         ## Inputs
         component : str
-            name of the component (ideally the aortic valve) for which we are computing the cardiac outpu
+            name of the component (ideally the aortic valve) for which we are computing the cardiac output
         
-        ## Outpus
+        ## Outputs
         CO : float
             the cardiac ouput value 
         """
@@ -243,6 +243,25 @@ def compute_cardiac_output(self, component:str)->float:
 
         return self.CO
 
+    def compute_ejection_fraction(self, component:str)->float:
+        """
+        Method for estimating the cardiac output.
+        
+        ## Inputs
+        component : str
+            name of the component (ideally one of the ventricles) for which we are computing Ejection Fraction
+        
+        ## Outputs
+        CO : float
+            the ejection fraction
+        """
+        ventricle = self.model.commponents[component]
+        edv = ventricle.V.values[self.tind].max()
+        esv = ventricle.V.values[self.tind].min()
+        self.EF = (edv - esv) / edv
+        return self.EF
+
+
     def compute_artery_pressure_range(self, component:str)->tuple[float]:
         """Method for computing the range of pressures in artery
 
@@ -279,4 +298,4 @@ def compute_end_systolic_pressure(self, component:str, upstream:str):
 
         flag = up > p  
         ind = np.arange(len(flag))[flag]
-        return p[ind[-1]]
+        return p[ind[-1]]