better feed priority; 0.49.1 release

setup.py

@@ -11,7 +11,7 @@
     name='thermosteam',
     packages=['thermosteam'],
     license='MIT',
-    version='0.49.0',
+    version='0.49.1',
     description="BioSTEAM's Premier Thermodynamic Engine",
     long_description=open('README.rst', encoding='utf-8').read(),
     author='Yoel Cortes-Pena',

thermosteam/__init__.py

@@ -31,7 +31,7 @@
 #     update_module(chemicals, numba)
 # use_numba_chemicals()
 # del use_numba_chemicals
-__version__ = "0.49.0"
+__version__ = "0.49.1"
 
 from . import thermo
 del thermo

thermosteam/network.py

@@ -2079,20 +2079,24 @@ def unmark_disjunction(stream):
     if port in disjunctions:
         disjunctions.remove(port)
 
+def feed_complexity(stream):
+    return stream.F_mass * (stream.mol != 0).sum()** 2
+
 def sort_feeds_big_to_small(feeds):
     if feeds:
         feed_priorities = tmo.AbstractStream.feed_priorities
+        feed_complexities = {i: feed_complexity(i) for i in feeds}
         def feed_priority(feed):
             if feed in feed_priorities:
                 return feed_priorities[feed]
             elif feed:
                 try:
-                    return 1. - feed.F_mass / F_mass_max if F_mass_max else 1.
+                    return 1. - feed_complexities[feed] / max_complexity if max_complexity else 1.
                 except:
                     return 2
             else:
                 return 2.
-        F_mass_max = max([i.F_mass for i in feeds])
+        max_complexity = max(feed_complexities.values())
         feeds.sort(key=feed_priority)
 
 # %% Path tools