prepare for use of jneqsim

equinor · Oct 15, 2024 · 8922775 · 8922775
1 parent d2c1402
commit 8922775
Show file tree

Hide file tree

Showing 16 changed files with 135 additions and 151 deletions.
diff --git a/.devcontainer/requirements.txt b/.devcontainer/requirements.txt
@@ -1,3 +1,4 @@
+jneqsim
 jpype1
 pandas
 matplotlib

diff --git a/neqsim/__init__.py b/neqsim/__init__.py
@@ -4,7 +4,8 @@
 It uses the Jpype module for bridging python and Java.
 """
 
-from neqsim.neqsimpython import jneqsim, jpype
+from jneqsim import neqsim
+import jpype
 
 
 def methods(checkClass):
@@ -26,8 +27,8 @@ def has_tabulate():
 
 
 def setDatabase(connectionString):
-    jneqsim.util.database.NeqSimDataBase.setConnectionString(connectionString)
-    jneqsim.util.database.NeqSimDataBase.setCreateTemporaryTables(True)
+    neqsim.util.database.NeqSimDataBase.setConnectionString(connectionString)
+    neqsim.util.database.NeqSimDataBase.setCreateTemporaryTables(True)
 
 
 def save_xml(javaobject, filename):

diff --git a/neqsim/lib/java11/neqsim-3.0.0.jar b/neqsim/lib/java11/neqsim-3.0.0.jar
diff --git a/neqsim/lib/java8/neqsim-3.0.0-Java8.jar b/neqsim/lib/java8/neqsim-3.0.0-Java8.jar
diff --git a/neqsim/neqsimpython.py b/neqsim/neqsimpython.py
diff --git a/neqsim/process/measurement.py b/neqsim/process/measurement.py
@@ -1,4 +1,4 @@
-from neqsim import jneqsim
+from jneqsim import neqsim
 import jpype
 import jpype.imports
 from jpype import JImplements, JOverride
@@ -10,8 +10,8 @@
 
 
 @JImplements(
-    jneqsim.processsimulation.measurementdevice.MeasurementDeviceInterface
-)  # Use the fully qualified class name directly from the jneqsim package
+    neqsim.processsimulation.measurementdevice.MeasurementDeviceInterface
+)  # Use the fully qualified class name directly from the neqsim package
 class measurement:
     def __init__(self):
         self.name = ""