Skip to content
GitLab
Projects Groups Topics Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in
  • E escet
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Graph
    • Compare revisions
    • Locked files
  • Issues 90
    • Issues 90
    • List
    • Boards
    • Service Desk
    • Milestones
    • Iterations
  • Merge requests 7
    • Merge requests 7
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test cases
  • Deployments
    • Deployments
    • Releases
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • Eclipse ProjectsEclipse Projects
  • Eclipse ESCET (Supervisory Control Engineering Toolkit)
  • escet
  • Merge requests
  • !196

#155 Linearization preserves more model structure and absolute names.

  • Review changes

  • Download
  • Patches
  • Plain diff
Merged Dennis Hendriks requested to merge 155-linearization-preserves-more-of-original-model-structure into develop Nov 15, 2021
  • Overview 21
  • Commits 11
  • Pipelines 2
  • Changes 129

Linearization preserves more of the original model structure and absolute names + other changes:

  • CifCollectUtils: added collectDeclarations/collectIoDeclarations.
  • LinearizationBase
    • No longer eliminates groups (and thus no longer pushes I/O file declarations inwards).
    • Replaces original automata by groups.
    • Now only moves disc/cont var declarations to new automaton.
      • Variable names in new aut based on original absolute names.
    • No longer moves inits/marked/invs from components to the new aut.
      • Inits/markeds/invs from locs still merged to new aut.
    • No longer merges I/O declarations into the new automaton.
    • No longer merges all enumerations to a single enumeration (and thus no longer adds default initial values).
    • removeChannelDataTypes: much simpler code now.
    • handleUrgency: does not actually need the specification.
    • Linearization may now produce models with scope absolute reference.
  • LinearizeMerge
    • Use absolute event names now for warning messages.
  • Various JavaDoc and comment improvements.
  • CifToPlcTrans
    • Updated CIF PLC code generator for linearization changes.
    • Still merges enums.
    • Now collects declarations from all components.
    • Improved absolute names in error messages, generated comments, etc.
    • Generated PLC code has some backward incompatible name changes.
      • Global variables have less 'M' of linearized automaton in names.
  • CodeGen
    • CIF code generator updated for linearization changes.
    • Still pushes print file declarations into print declarations.
    • Still merges enums.
    • Now collects declarations from all components.
    • Improved original event absolute names.
    • Improved absolute names in generated comments.
    • Improved print declaration order.
  • Linearization test updates.
    • Realigned linearization product/merge test models.
    • Removed linearization enum merge test as enums no longer merged.
    • Linearization tests for renames updated for recent changes.
  • Linearization documentation updates and improvements.
  • CIF PLC code generator tests and documentation updated.
  • CIF code generator tests and documentation updated.

Closes #155 (closed)

Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: 155-linearization-preserves-more-of-original-model-structure

Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent