modelica / ModelicaStandardLibrary

Free (standard conforming) library to model mechanical (1D/3D), electrical (analog, digital, machines), magnetic, thermal, fluid, control systems and hierarchical state machines. Also numerical functions and functions for strings, files and streams are included.
https://doc.modelica.org
BSD 3-Clause "New" or "Revised" License
472 stars 169 forks source link

Improve inheritance in MultiBody using selective model extension #4231

Open tobolar opened 10 months ago

tobolar commented 10 months ago

A first draft for #3739 using "selective model extension" introduced in ModelicaSpec 3.6. See also comment https://github.com/modelica/ModelicaStandardLibrary/pull/4091#issuecomment-1801329028.

The approach implemented here is to reduce the number of possible base classes for variants of connector interfaces by introducing just one (or significantly less number of) extended base class containing more/all the concerned connectors at once and to disable selected unused connectors in extending classes.

This PR-draft is about MultiBody library. It introduces base classes

Some notes:

  1. Hopefully, this approach will lead to elimination of base classes like Interfaces.PartialOneFrame_a and Interfaces.PartialOneFrame_b.
  2. In this PR, the approach is implemented in parts for multibody Forces and Sensors. After the proof-of-concept, it shall be extended to other multibody classes as well.
  3. There is a lot of commits in order to enable simply cherry-picking - if needed later on.
  4. Icon: in some cases, like for Forces.WorldTorque, the diagram and icon layout was changed, since in the PartialTwoFramesResolve the frame_resolve connector is placed at the icon's bottom boundary (instead of the top).
  5. Icon: text "a" beneath the connector frame_a was deleted. Similarly for "b" and frame_b.
  6. The cardinality assertion like assert(cardinality(frame_a) > 0,...) is no more used.
tobolar commented 10 months ago

It seems MapleSim's moparser can yet not deal with the "selective model extension". ;-) https://github.com/modelica/ModelicaStandardLibrary/actions/runs/6848246047/job/18618044784

eshmoylova commented 10 months ago

The new version of MapleSim's moparser allows it. But I do not know how to upload it. The github page for it was archived. I sent an email to @dietmarw.

beutlich commented 10 months ago

The new version of MapleSim's moparser allows it. But I do not know how to upload it. The github page for it was archived. I sent an email to @dietmarw.

PRs are now accepted again. Thanks! It is appreciated.

beutlich commented 10 months ago

Syntax checks still fail with MapleSim Stand-Alone Modelica Parser 3.6 (after branch rebase).

eshmoylova commented 10 months ago

@beutlich what version of moparser is used for the checks? It works for me. To double check, I downloaded the latest version from the github page and the files from this PR. Tested on Linux64 and Windows 64. Both returned no errors. Note that 32 bit platforms are no longer built, so the files were not updated (only 3.4 grammar) and just moved to the Obsolete folder.

beutlich commented 10 months ago

what version of moparser is used for the checks

MapleSim Stand-Alone Modelica Parser 3.6, see https://github.com/modelica/ModelicaStandardLibrary/actions/runs/6912730662/job/18808801660?pr=4231

eshmoylova commented 10 months ago

If you click on the triangle next to "Run echo "::add-matcher::./.github/moparser.json"" in that link, it looks like the version for moparser is explicitly set the version to 3.4:

 ModelicaSyntaxChecker/Linux64/moparser -v 3.4 -r Complex.mo Modelica ModelicaReference ModelicaServices ModelicaTest ModelicaTestConversion4.mo 
image

The workflow would need to be updated to call -v 3.6 or completely remove -v option, to rely on the default version.

tobolar commented 10 months ago

If you click on the triangle next to "Run echo "::add-matcher::./.github/moparser.json"" in that link,

The confusing is, MapleSim reports in right that link that it is 3.6:

MapleSim Stand-Alone Modelica Parser 3.6 Copyright (c) 2023 by Maplesoft. May be freely used for library ...

beutlich commented 10 months ago

If you click on the triangle next to "Run echo "::add-matcher::./.github/moparser.json"" in that link, it looks like the version for moparser is explicitly set the version to 3.4:

 ModelicaSyntaxChecker/Linux64/moparser -v 3.4 -r Complex.mo Modelica ModelicaReference ModelicaServices ModelicaTest ModelicaTestConversion4.mo 
image

The workflow would need to be updated to call -v 3.6 or completely remove -v option, to rely on the default version.

Thanks, see #4235.