Changeset 14191


Ignore:
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:
3 edited

Legend:

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

    r14187 r14191  
    160160                    extFunctionExecutable = new ExternalFunctionExecutableDynamic(arguments);
    161161                   
    162                     debugMsg = "Succesfully connected external function '" + ext.getName() + "' to the evaluator";
     162                    debugMsg = "Successfully connected external function '" + ext.getName() + "' to the evaluator";
    163163                } else {
    164164                    executable = mc.compileExternal(ext);
     
    166166                    extFunctionExecutable = new ExternalFunctionExecutableGenerated(executable);
    167167                   
    168                     debugMsg = "Succesfully compiled external function '" + ext.getName() + "' to executable '"
     168                    debugMsg = "Successfully compiled external function '" + ext.getName() + "' to executable '"
    169169                            + executable + "'";
    170170                }
  • branches/dev-cw-2641/Compiler/ModelicaFrontEnd/src/java/org/jmodelica/common/evaluation/LiveExternalFunction.java

    r14187 r14191  
    6969            map.setup(ext, values, timeout, com);
    7070            long time3 = System.currentTimeMillis();
    71             compiler.log().debug("Setup live external function: " + ext.getName()
     71            compiler.log().debug(ExternalFunction.EXTERNAL_LOG_PREFIX+"Setup live external function: " + ext.getName()
    7272                      + ", createProcessCommunicator() time: " + (time2 - time1)
    7373                      + "ms, setup time: " + (time3 - time2) + "ms");
  • branches/dev-cw-2641/Python/src/tests_jmodelica/general/test_extfunctions.py

    r13908 r14191  
    4949        nbr_of_evaluator_calls = 0
    5050        with open("log.txt") as f:
    51             res = fnmatch.filter(f, "Succesfully connected external function '*' to the evaluator*")
     51            res = fnmatch.filter(f, "*Successfully connected external function '*' to the evaluator*")
    5252            nbr_of_evaluator_calls = len(res)
    5353       
     
    7070        nbr_of_evaluator_calls = 0
    7171        with open("log.txt") as f:
    72             res = fnmatch.filter(f, "Succesfully connected external function '*' to the evaluator*")
     72            res = fnmatch.filter(f, "*Successfully connected external function '*' to the evaluator*")
    7373            nbr_of_evaluator_calls = len(res)
    7474       
     
    102102        matches = 0
    103103        with open("log_unknown_shared.txt") as f:
    104             res = fnmatch.filter(f, "Could not find a shared library containing*")
     104            res = fnmatch.filter(f, "*Could not find a shared library containing*")
    105105            matches = len(res)
    106106       
     
    114114        nbr_of_evaluator_calls = 0
    115115        with open("log.txt") as f:
    116             res = fnmatch.filter(f, "Succesfully connected external function '*' to the evaluator*")
     116            res = fnmatch.filter(f, "*Successfully connected external function '*' to the evaluator*")
    117117            nbr_of_evaluator_calls = len(res)
    118118       
     
    131131        nbr_of_evaluator_calls = 0
    132132        with open("log.txt") as f:
    133             res = fnmatch.filter(f, "Succesfully connected external function '*' to the evaluator*")
     133            res = fnmatch.filter(f, "*Successfully connected external function '*' to the evaluator*")
    134134            nbr_of_evaluator_calls = len(res)
    135135       
     
    147147        nbr_of_evaluator_calls = 0
    148148        with open("log.txt") as f:
    149             res = fnmatch.filter(f, "Succesfully connected external function '*' to the evaluator*")
     149            res = fnmatch.filter(f, "*Successfully connected external function '*' to the evaluator*")
    150150            nbr_of_evaluator_calls = len(res)
    151151       
Note: See TracChangeset for help on using the changeset viewer.