Changeset 14191

Timestamp:

Nov 27, 2019 8:42:33 AM (9 days ago)

Author:

Christian Andersson

Message:

Minor updates to the external evaluator. Related to ticket:5872

Location:

branches/dev-cw-2641

Files:

• Compiler/ModelicaFrontEnd/src/java/org/jmodelica/common/evaluation/ExternalProcessCacheImpl.java (modified) (2 diffs)
• Compiler/ModelicaFrontEnd/src/java/org/jmodelica/common/evaluation/LiveExternalFunction.java (modified) (1 diff)
• Python/src/tests_jmodelica/general/test_extfunctions.py (modified) (6 diffs)

branches/dev-cw-2641/Compiler/ModelicaFrontEnd/src/java/org/jmodelica/common/evaluation/ExternalProcessCacheImpl.java

@@ -160 +160 @@
                     extFunctionExecutable = new ExternalFunctionExecutableDynamic(arguments);
                     
-                    debugMsg = "Succesfully connected external function '" + ext.getName() + "' to the evaluator";
+                    debugMsg = "Successfully connected external function '" + ext.getName() + "' to the evaluator";
                 } else {
                     executable = mc.compileExternal(ext);
@@ -166 +166 @@
                     extFunctionExecutable = new ExternalFunctionExecutableGenerated(executable);
                     
-                    debugMsg = "Succesfully compiled external function '" + ext.getName() + "' to executable '"
+                    debugMsg = "Successfully compiled external function '" + ext.getName() + "' to executable '"
                             + executable + "'";
                 }

branches/dev-cw-2641/Compiler/ModelicaFrontEnd/src/java/org/jmodelica/common/evaluation/LiveExternalFunction.java

@@ -69 +69 @@
             map.setup(ext, values, timeout, com);
             long time3 = System.currentTimeMillis();
-            compiler.log().debug("Setup live external function: " + ext.getName()
+            compiler.log().debug(ExternalFunction.EXTERNAL_LOG_PREFIX+"Setup live external function: " + ext.getName()
                       + ", createProcessCommunicator() time: " + (time2 - time1)
                       + "ms, setup time: " + (time3 - time2) + "ms");

branches/dev-cw-2641/Python/src/tests_jmodelica/general/test_extfunctions.py

@@ -49 +49 @@
         nbr_of_evaluator_calls = 0
         with open("log.txt") as f:
-            res = fnmatch.filter(f, "Succesfully connected external function '*' to the evaluator*")
+            res = fnmatch.filter(f, "*Successfully connected external function '*' to the evaluator*")
             nbr_of_evaluator_calls = len(res)
         
@@ -70 +70 @@
         nbr_of_evaluator_calls = 0
         with open("log.txt") as f:
-            res = fnmatch.filter(f, "Succesfully connected external function '*' to the evaluator*")
+            res = fnmatch.filter(f, "*Successfully connected external function '*' to the evaluator*")
             nbr_of_evaluator_calls = len(res)
         
@@ -102 +102 @@
         matches = 0
         with open("log_unknown_shared.txt") as f:
-            res = fnmatch.filter(f, "Could not find a shared library containing*")
+            res = fnmatch.filter(f, "*Could not find a shared library containing*")
             matches = len(res)
         
@@ -114 +114 @@
         nbr_of_evaluator_calls = 0
         with open("log.txt") as f:
-            res = fnmatch.filter(f, "Succesfully connected external function '*' to the evaluator*")
+            res = fnmatch.filter(f, "*Successfully connected external function '*' to the evaluator*")
             nbr_of_evaluator_calls = len(res)
         
@@ -131 +131 @@
         nbr_of_evaluator_calls = 0
         with open("log.txt") as f:
-            res = fnmatch.filter(f, "Succesfully connected external function '*' to the evaluator*")
+            res = fnmatch.filter(f, "*Successfully connected external function '*' to the evaluator*")
             nbr_of_evaluator_calls = len(res)
         
@@ -147 +147 @@
         nbr_of_evaluator_calls = 0
         with open("log.txt") as f:
-            res = fnmatch.filter(f, "Succesfully connected external function '*' to the evaluator*")
+            res = fnmatch.filter(f, "*Successfully connected external function '*' to the evaluator*")
             nbr_of_evaluator_calls = len(res)