update

Author: EvenSol

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "neqsim"
-version = "3.1.5"
+version = "3.2.0"
 homepage = "https://github.com/Equinor/neqsim-python"
 description = "NeqSim is a tool for thermodynamic and process calculations"
 authors = ["Even Solbraa <[email protected]>"]

src/neqsim/lib/java11/neqsim-3.1.5.jar src/neqsim/lib/java11/neqsim-3.2.0.jarsrc/neqsim/lib/java11/neqsim-3.1.5.jar renamed to src/neqsim/lib/java11/neqsim-3.2.0.jar

@@ -42,8 +42,8 @@ def equals(self, obj):
     @JOverride  # Implement the missing 'hashCode' method
     def hashCode(self):
         # Implement your hash code logic here.
-        # A simple example is to return the hash of the object's name:
-        return hash(self.name)
+        # Ensure the hash fits within Java int range (-2^31 to 2^31-1)
+        return hash(self.name) & 0x7FFFFFFF
 
     @JOverride  # Implement the missing 'setController' method
     def setController(self, controller):
@@ -176,7 +176,7 @@ def setRegulatorOutSignal(self):
         # Add the logic to calculate or retrieve the pressure.
 
     @JOverride  # Implement the missing 'run' method
-    def run(self, id):
+    def run(self, id=None):
         pass
 
     @JOverride  # Implement the missing 'setTime' method
@@ -200,19 +200,18 @@ def solved(self):
         return True  # Replace 0.0 with the actual pressure value or calculatio
         # Add the logic to calculate or retrieve the pressure.
 
-    @JOverride  # Implement the missing 'getExergyChange' method
+    @JOverride  # Implement the missing 'getCalculationIdentifier' method
     def getCalculationIdentifier(self):
-        # Add the logic to calculate or retrieve the pressure.
-        # This will depend on how pressure is handled in your 'unitop' class.
-        return 0.0  # Replace 0.0 with the actual pressure value or calculatio
-        # Add the logic to calculate or retrieve the pressure.
+        # Return the stored calculation identifier UUID
+        if not hasattr(self, '_calculationIdentifier') or self._calculationIdentifier is None:
+            import java.util
+            self._calculationIdentifier = java.util.UUID.randomUUID()
+        return self._calculationIdentifier
 
-    @JOverride  # Implement the missing 'getExergyChange' method
+    @JOverride  # Implement the missing 'setCalculationIdentifier' method
     def setCalculationIdentifier(self, idf):
-        # Add the logic to calculate or retrieve the pressure.
-        # This will depend on how pressure is handled in your 'unitop' class.
-        pass  # Replace 0.0 with the actual pressure value or calculatio
-        # Add the logic to calculate or retrieve the pressure.
+        # Store the calculation identifier UUID
+        self._calculationIdentifier = idf
 
     @JOverride  # Implement the missing 'getExergyChange' method
     def getCalculateSteadyState(self):

…/neqsim/lib/java8/neqsim-3.1.5-Java8.jar …/neqsim/lib/java8/neqsim-3.2.0-Java8.jarsrc/neqsim/lib/java8/neqsim-3.1.5-Java8.jar renamed to src/neqsim/lib/java8/neqsim-3.2.0-Java8.jar src/neqsim/lib/java8/neqsim-3.1.5-Java8.jar renamed to src/neqsim/lib/java8/neqsim-3.2.0-Java8.jar

@@ -26,12 +26,13 @@ def getOutputStream(self):
         return self.outputstream
 
     @JOverride
-    def run(self, id):
-        print("here2")
+    def run(self, id=None):
+        """Doubles the input stream pressure and updates the output stream."""
+        # Get the current input stream's fluid
         fluid2 = self.inputstream.getFluid().clone()
-        fluid2.setPressure(fluid2.getPressure() * 2.0)
-        self.outputstream.setFluid(fluid2)
-        self.outputstream.run()
+        fluid2.setPressure(self.inputstream.getPressure() * 2.0)
+        self.getOutputStream().setFluid(fluid2)
+        self.getOutputStream().run()
 
 
 def test_addPythonUnitOp():
@@ -49,13 +50,11 @@ def test_addPythonUnitOp():
     uop.setName("example operation 1")
     uop.setInputStream(stream1)
 
-    stream2 = jneqsim.process.equipment.stream.Stream("stream2", uop.getOutputStream())
-
     oilprocess = jneqsim.process.processmodel.ProcessSystem()
     oilprocess.add(stream1)
     oilprocess.add(uop)
-    oilprocess.add(stream2)
 
     oilprocess.run()
 
-    assert stream2.getPressure() == 2 * stream1.getPressure()
+    # The outputstream gets the doubled pressure after run()
+    assert uop.getOutputStream().getPressure() == 2 * stream1.getPressure()