Merge remote-tracking branch 'origin/master' into visualModeling

Fork: 1

nitta-lab / AlgebraicDataflowArchitectureModel

Browse code Merge remote-tracking branch 'origin/master' into visualModeling Conflicts: AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java AlgebraicDataflowArchitectureModel/src/graphicalrefactor/views/GraphicalRefactorMenuBar.java 2024_stable FACS2023 MODELS2025_submit Models2024 SimulatorVisualization apply-visitor-pattern ast-algebra ast-core ast-core-refactor bug-pathParam bug-swingNativeReceiver commonToControlFlowAndDependencyModelings controlFlowModeling dependencyModeling dynamicResourceCreation experiment20231128 extendForWebServices feature-addTableUI feature-keyboard-shortcuts feature_addLoggerToCFD fix-window-position fixSerializeException fix_connectionAnEdgeAtDependsOnMediator forWebServices gameEngine gameEngine-DTRAM gameEngine2 hieararchicalLayout hierarchical-control-flow-modeling htmlGUi integratedCodeGenerator language-server master refactor search simulationLayout simulator swingInterface test two-stage-modeling update-dtram-parser update-parser updateHierarchicalResources
commit b1ea652c2b142e95baa97124ce249848d39d3eb9 2 parents c090a7a + f0e4a32 Naoya Nitta authored on 20 Feb 2023

Browse code

Conflicts:
	AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java
	AlgebraicDataflowArchitectureModel/src/graphicalrefactor/views/GraphicalRefactorMenuBar.java

2024_stable FACS2023 MODELS2025_submit Models2024 SimulatorVisualization apply-visitor-pattern ast-algebra ast-core ast-core-refactor bug-pathParam bug-swingNativeReceiver commonToControlFlowAndDependencyModelings controlFlowModeling dependencyModeling dynamicResourceCreation experiment20231128 extendForWebServices feature-addTableUI feature-keyboard-shortcuts feature_addLoggerToCFD fix-window-position fixSerializeException fix_connectionAnEdgeAtDependsOnMediator forWebServices gameEngine gameEngine-DTRAM gameEngine2 hieararchicalLayout hierarchical-control-flow-modeling htmlGUi integratedCodeGenerator language-server master refactor search simulationLayout simulator swingInterface test two-stage-modeling update-dtram-parser update-parser updateHierarchicalResources

commit b1ea652c2b142e95baa97124ce249848d39d3eb9

2 parents c090a7a + f0e4a32

Naoya Nitta authored on 20 Feb 2023

Patch

Unified Split

Showing 8 changed files

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/models/Algolike.model 0 → 100644

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/algorithms/TypeInference.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/DAGLayoutAction.java 0 → 100644

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/graphicalrefactor/layouts/DAGLayout.java 0 → 100644

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/graphicalrefactor/views/GraphicalRefactorMenuBar.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/DataConstraintModel.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/models/dataFlowModel/ModelExtension.java

Show line notes below