Changeset 14178


Ignore:
Timestamp:
Nov 26, 2019 10:32:35 AM (9 days ago)
Author:
randersson
Message:

#5819 Merged r14153, r14154, r14156 and r14167.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        11https://svn.jmodelica.org/assimulo/tags/Assimulo-3.1 external/Assimulo
        2 https://svn.jmodelica.org/PyFMI/tags/PyFMI-2.5.7/src/common Python/src/common
         2https://svn.jmodelica.org/PyFMI/trunk/src/common Python/src/common
        33https://github.com/chria/casadi/branches/tested_mod@11366 ThirdParty/CasADi/CasADi
        44https://svn.jmodelica.org/FMILibrary/trunk@10948 external/FMILibrary/FMILibrary
        5 https://svn.jmodelica.org/PyFMI/tags/PyFMI-2.5.7 external/PyFMI
         5https://svn.jmodelica.org/PyFMI/trunk external/PyFMI
    • Property svn:mergeinfo changed
      /branches/dev-ra-5819f (added)merged: 14153,​14156,​14167
  • trunk/CHANGELOG.txt

    r14161 r14178  
    11================= Unreleased ==================
     2; Fixed ; Minor ; PyJMI ; #5819
     3Fixed bug in pyjmi with parse_jmi_log when parsing matrices in Python 3,
     4where matrices did sometimes contain empty rows.
     5
    26; Fixed ; Minor ; Runtime ; #5884
    37Fixed an issue on Linux with linking external model libraries
  • trunk/Python/src/pyjmi/log/parser.py

    r14056 r14178  
    7171        return np.zeros((0,0))
    7272    parts = semicolon_pattern.split(text)
    73     parts = parts[1::2]
     73    parts = filter(None, map(str, parts))
    7474    return np.asarray([parse_vector(part) for part in parts])
    7575   
  • trunk/Python/src/tests_jmodelica/test_fmi.py

    r14056 r14178  
    325325        """
    326326        rlc = load_fmu(Test_FMUModelCS1.rlc_circuit)
    327         assert rlc._get_version() == '1.0'
     327        assert rlc.get_version() == '1.0'
    328328
    329329    @testattr(stddist_full = True)
     
    712712        """
    713713        bounce = load_fmu('bouncingBall.fmu',path_to_fmus_me1)
    714         assert bounce._get_version() == '1.0'
     714        assert bounce.get_version() == '1.0'
    715715        dq = load_fmu('dq.fmu',path_to_fmus_me1)
    716         assert dq._get_version() == '1.0'
     716        assert dq.get_version() == '1.0'
    717717
    718718    @testattr(stddist_full = True)
Note: See TracChangeset for help on using the changeset viewer.