TNO Intern

Commit 356a8534 authored by Hen Brett's avatar Hen Brett 🐔
Browse files

Adding two functions which print the location of the java virtual machine and... 

Adding two functions which print the location of the java virtual machine and the thermogis jar path
parent 8271be39

src/pythermogis/thermogis_classes/doublet.py

+3 −0
Original line number Diff line number Diff line
@@ -122,6 +122,9 @@ def calculate_performance_of_single_location(mask: float, depth: float, thicknes 
    results = doublet.calculateDoubletPerformance(input)



    # If calculation was not successful, return mask value

    if results is None:

        return (mask_value,) * 14



    if results.utc() == -9999.0:

        return (mask_value,) * 14

src/pythermogis/thermogis_classes/jvm_start.py

+14 −0
Original line number Diff line number Diff line
@@ -48,3 +48,17 @@ def close_jvm(): 
    """

    if jpype.isJVMStarted():

        jpype.shutdownJVM()



def print_java_path():

    """

    This method prints the path to the JVM being used

    :return:

    """

    print(os.getenv("JAVA_HOME"))



def print_thermogis_jar_path():

    """

    This method prints the path to the Thermogis Jar being used

    :return:

    """

    print(get_thermogis_jar_path())

tests/test_java_installation.py

+7 −2
Original line number Diff line number Diff line 
from pythermogis import start_jvm

from pythermogis import print_java_path, print_thermogis_jar_path, start_jvm





def test_JVM_start():

    start_jvm()



def test_JVM_JAR_print():

    print_java_path()

    print_thermogis_jar_path()
 
 No newline at end of file

src/pythermogis/__init__.py

+1 −1

File changed.

Contains only whitespace changes.