Skip to content

Conversation

@twalmsley
Copy link
Collaborator

This merge request contains quite a few changes as listed in the commits below. I realise that not necessarily all of these changes will be accepted, so this PR is to get the changes into a branch in the main MC repository so that corrections can be made from there. I would ask that these changes are accepted en-masse into the new branch, then issues can be raised to make any necessary changes in this branch before merging into the main branch. The issues can be assigned to me or other people are welcome to contribute as well.

  • 8297c51 (HEAD -> main, origin/main, origin/HEAD) Deleted superfluous presentation slides.
  • 511643d (origin/possible-worlds-example) Rename one of the examples.
  • 936e0c2 PossibleWorlds example: added an activity requirement and requirement spcification that causes the serviced car requirement to begin.
  • 069d227 Renamed functions and variables for clarity in the possible worlds example.
  • ed8dabc Set dates for the car requirement and gave PointsInTime their own namespace.
  • 83fdb54 WIP Checkpoint
  • d288158 (origin/add-intended-roles-to-domain-extensions) Added intended roles to the F35 example TTL file.
  • 13b617d Added intended roles to the Java classes.
  • 45e2c27 Added a README for the F35 model extension example.
  • b0ca18e (origin/hide-extension-module-impls) Hide example extension module impls.
  • e3515dc Hide F35 extension module impls.
  • 5851c56 Add a PossibleWorld to the F35ModelExtensionTest.
  • 8bece8c (origin/domain-extension-schema) Add a mechanism for domain extensions to provide their model as TTL.
  • 67c5ede (origin/f35-domain-extension-example) Cosmetic refactor
  • 3deb9ef Use shorter IDs in the F35ModelExtensionTest to make diagrams easier to read.
  • e9d3096 Added possible world.
  • bc94fb4 Added turbine and VLS to the F35 Aircraft extension and example.
  • 7fe3f23 Added the installed ejection seat in the aircraft.
  • f8b9e91 Added the installed engine in the aircraft.
  • f4f202e Added the installed airframe in the aircraft.
  • 18bbb65 Added InstalledF35AirframeInF35Aircraft and associated classes.
  • d94bef5 F35ModelExtensionsTest in the examples module creates an Engine System with components and installed functional objects.
  • 502d0df Tweaks to the UML diagram generator.
  • 012f47e Added a UML diagram generator to the F35 extensions example.
  • 068cbd4 Added InstalledF135TurbineInF135System and related classes.
  • 2358729 Added InstalledF135EngineInF135System and related classes.
  • 80586c8 Relax the 120 column line length limit.
  • a3f00df Fix bugs in the F35 domain model extensions.
  • c085b1c Change the package and module for the F35 example domain extensions.
  • 0b4dd72 Added classes for the engine system separate from the aircraft system.
  • d4e2d6d Created a system, system component, and ordinary funtional object model for the F35 example.
  • fac9a95 Added some F35-related entity types.
  • 8f8118d (origin/use-patterns-instead-of-signs) Update the test data and tests to use patterns instead of signs.
  • 6ba86fb Update to use SKOS_DEFINITION where necessary.
  • 35256ac Update ExampleSigns to ExamplePatterns and the corresponding unit test.
  • c7f9992 (origin/use-skos-definition-for-values) Use skos:definition instead of hqdm:value for sign values.
  • e73e060 (origin/use-latest-hqdm-ttl) Remove duplicate 'if' statements.
  • cb6ee2e Updated to latest HQDM ontology.
  • ec7e77c Use skos:prefLabel instead of hqdm:data_EntityName
  • 0603e3b Added @SuppressWarnings("unchecked") annotations to improve type safety in MagmaCoreService, HqdmObject, DynamicObjects, and their tests.

twalmsley and others added 30 commits February 28, 2024 15:02
…ty in MagmaCoreService, HqdmObject, DynamicObjects, and their tests.
…m with components and installed functional objects.
… spcification that causes the serviced car requirement to begin.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants