Merge branch '105-use-the-new-jar-that-doesnt-cover-the-gui' into 'main' (f8f696e7) · Commits · AGS_public / pythermogis

src/pythermogis/constants.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@ from pathlib import Path
		import platform

		THERMOGIS_JAR_PATH = (
		Path(__file__).parent / "thermogis_jar" / "thermogis-1.7.0-shaded.jar"
		Path(__file__).parent / "thermogis_jar" / "thermogis-1.7.0-pythermogis.jar"
		)

		JVM17_PATH = Path(__file__).parent / "jvm" / "JVM17"

src/pythermogis/thermogis_classes/doublet.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -2,6 +2,8 @@ import numpy as np
		import xarray as xr
		from jpype import JClass

		from pythermogis.thermogis_classes.mock import create_logger_mock

		def simulate_doublet(
		output_data: xr.Dataset,
		reservoir_properties: xr.Dataset,
		@@ -186,10 +188,8 @@ def instantiate_thermogis_doublet(utc_properties) -> JClass:
		"""

		# Instantiate doublet class
		Logger = JClass("logging.Logger")
		Mockito = JClass("org.mockito.Mockito")
		ThermoGISDoublet = JClass("thermogis.calc.utc.doublet.ThermoGisDoublet")

		doublet = ThermoGISDoublet(Mockito.mock(Logger), utc_properties)
		doublet = ThermoGISDoublet(create_logger_mock(), utc_properties)

		return doublet

src/pythermogis/thermogis_classes/mock.py

0 → 100644

+42 −0

Original line number	Diff line number	Diff line
		import jpype
		from jpype import JImplements, JOverride

		def create_logger_mock():
		"""Call this only after JVM has started."""

		@JImplements("logging.Logger")
		class LoggerMock:

		@JOverride
		def initialize(self, clazz):
		pass

		@JOverride
		def info(self, message):
		pass

		@JOverride
		def debug(self, message):
		pass

		@JOverride
		def warn(self, message):
		pass

		@JOverride
		def error(self, message):
		pass

		@JOverride(sticky=True)
		def error(self, message, throwable=None):
		pass

		@JOverride
		def getWarningStore(self):
		return jpype.JClass("java.util.ArrayList")()

		@JOverride
		def clearWarningStore(self):
		pass

		return LoggerMock()
		No newline at end of file

src/pythermogis/thermogis_jar/thermogis-1.7.0-shaded.jar→src/pythermogis/thermogis_jar/thermogis-1.7.0-pythermogis.jar

LFS

(134 B)

File changed and moved.

No diff preview for this file type.

View original file

View changed file

tests/java/test_ThermoGISDoublet_Benchmark.py

+12 −18

Original line number	Diff line number	Diff line
		@@ -3,6 +3,8 @@ from unittest import TestCase
		import pytest

		from pythermogis import *
		from pythermogis.thermogis_classes.mock import create_logger_mock


		class ThermoGISDoubletBenchmark(TestCase):
		"""
		@@ -17,8 +19,6 @@ class ThermoGISDoubletBenchmark(TestCase):
		"""
		# Arrange
		start_jvm()
		Logger = JClass("logging.Logger")
		Mockito = JClass("org.mockito.Mockito")
		ThermoGISDoublet = JClass("thermogis.calc.utc.doublet.ThermoGisDoublet")
		DoubletInput = JClass("thermogis.calc.utc.doublet.Doublet.DoubletInput")
		ThermoGISParameters = JClass("thermogis.parameters.ThermoGISParameters")
		@@ -44,7 +44,7 @@ class ThermoGISDoubletBenchmark(TestCase):
		None, # ates input
		)

		doublet = ThermoGISDoublet(Mockito.mock(Logger), utc_properties)
		doublet = ThermoGISDoublet(create_logger_mock(), utc_properties)


		# Act
		@@ -66,8 +66,6 @@ class ThermoGISDoubletBenchmark(TestCase):
		"""
		# Arrange
		start_jvm()
		Logger = JClass("logging.Logger")
		Mockito = JClass("org.mockito.Mockito")
		ThermoGISDoublet = JClass("thermogis.calc.utc.doublet.ThermoGisDoublet")
		DoubletInput = JClass("thermogis.calc.utc.doublet.Doublet.DoubletInput")

		@@ -94,7 +92,7 @@ class ThermoGISDoubletBenchmark(TestCase):
		temperature,
		None, # ates input
		)
		doublet = ThermoGISDoublet(Mockito.mock(Logger), utc_properties)
		doublet = ThermoGISDoublet(create_logger_mock(), utc_properties)

		# Act
		results = doublet.calculateDoubletPerformance(input)
		@@ -116,8 +114,7 @@ class ThermoGISDoubletBenchmark(TestCase):
		"""
		# Arrange
		start_jvm()
		Logger = JClass("logging.Logger")
		Mockito = JClass("org.mockito.Mockito")

		ThermoGISDoublet = JClass("thermogis.calc.utc.doublet.ThermoGisDoublet")
		DoubletInput = JClass("thermogis.calc.utc.doublet.Doublet.DoubletInput")

		@@ -146,7 +143,7 @@ class ThermoGISDoubletBenchmark(TestCase):
		temperature,
		None, # ates input
		)
		doublet = ThermoGISDoublet(Mockito.mock(Logger), utc_properties)
		doublet = ThermoGISDoublet(create_logger_mock(), utc_properties)

		# Act
		results = doublet.calculateDoubletPerformance(input)
		@@ -168,8 +165,7 @@ class ThermoGISDoubletBenchmark(TestCase):
		"""
		# Arrange
		start_jvm()
		Logger = JClass("logging.Logger")
		Mockito = JClass("org.mockito.Mockito")

		ThermoGISDoublet = JClass("thermogis.calc.utc.doublet.ThermoGisDoublet")
		DoubletInput = JClass("thermogis.calc.utc.doublet.Doublet.DoubletInput")

		@@ -198,7 +194,7 @@ class ThermoGISDoubletBenchmark(TestCase):
		temperature,
		None, # ates input
		)
		doublet = ThermoGISDoublet(Mockito.mock(Logger), utc_properties)
		doublet = ThermoGISDoublet(create_logger_mock(), utc_properties)

		# Act
		results = doublet.calculateDoubletPerformance(input)
		@@ -222,8 +218,7 @@ class ThermoGISDoubletBenchmark(TestCase):
		"""
		# Arrange
		start_jvm()
		Logger = JClass("logging.Logger")
		Mockito = JClass("org.mockito.Mockito")

		ThermoGISDoublet = JClass("thermogis.calc.utc.doublet.ThermoGisDoublet")
		DoubletInput = JClass("thermogis.calc.utc.doublet.Doublet.DoubletInput")

		@@ -252,7 +247,7 @@ class ThermoGISDoubletBenchmark(TestCase):
		temperature,
		None, # ates input
		)
		doublet = ThermoGISDoublet(Mockito.mock(Logger), utc_properties)
		doublet = ThermoGISDoublet(create_logger_mock(), utc_properties)

		# Act
		results = doublet.calculateDoubletPerformance(input)
		@@ -274,8 +269,7 @@ class ThermoGISDoubletBenchmark(TestCase):
		"""
		# Arrange
		start_jvm()
		Logger = JClass("logging.Logger")
		Mockito = JClass("org.mockito.Mockito")

		ThermoGISDoublet = JClass("thermogis.calc.utc.doublet.ThermoGisDoublet")
		DoubletInput = JClass("thermogis.calc.utc.doublet.Doublet.DoubletInput")

		@@ -305,7 +299,7 @@ class ThermoGISDoubletBenchmark(TestCase):
		temperature,
		None, # ates input
		)
		doublet = ThermoGISDoublet(Mockito.mock(Logger), utc_properties)
		doublet = ThermoGISDoublet(create_logger_mock(), utc_properties)

		# Act
		results = doublet.calculateDoubletPerformance(input)