Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

prepare for use of jneqsim #292

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open
1 change: 1 addition & 0 deletions .devcontainer/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
jneqsim
jpype1
pandas
matplotlib
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/runtests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
build:
strategy:
matrix:
version: [3.8, 3.9, 3.12]
version: [3.9, 3.12]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ NeqSim Python is distributed as a pip package.

End-users should install neqsim python with some additional packages by running
```
pip install neqsim[interactive]
pip install neqsim
```

## Getting Started
Expand Down
7 changes: 4 additions & 3 deletions neqsim/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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):
Expand Down
Binary file removed neqsim/lib/java11/neqsim-3.0.2.jar
Binary file not shown.
Binary file removed neqsim/lib/java8/neqsim-3.0.2-Java8.jar
Binary file not shown.
20 changes: 0 additions & 20 deletions neqsim/neqsimpython.py

This file was deleted.

8 changes: 3 additions & 5 deletions neqsim/process/measurement.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
from neqsim import jneqsim
import jpype
import jpype.imports
from jneqsim import neqsim
from jpype import JImplements, JOverride


Expand All @@ -10,8 +8,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 = ""
Expand Down
Loading
Loading