Merge branch 'ohta'

Fork: 1

nitta-lab / AlgebraicDataflowArchitectureModel

Browse code Merge branch 'ohta' Conflicts: AlgebraicDataflowArchitectureModel/src/graphicalrefactor/editor/Editor.java ASE2022submit FACS2023 Models2024 SimulatorVisualization controlFlowModeling dynamicResourceCreation experiment20231128 experiment_2023_1_25 extendForWebServices feature_addLoggerToCFD fix fixSerializeException fix_connectionAnEdgeAtDependsOnMediator forMultipleOutputResources forWebServices hieararchicalLayout htmlGUi importVisualModelingUpdates interfaces langSpecModification master ohta ohta2 ota outputChannelAsAClass refactor simulationLayout simulator swingInterface test two-stage-modeling updateHierarchicalResources
commit 0c1835a7e3b88fb7266c59dee6af4ce8ab85b6a3 2 parents 339a9b1 + e940a5e yoichiro authored on 6 Apr 2020

Browse code

Merge branch 'ohta'

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

ASE2022submit FACS2023 Models2024 SimulatorVisualization controlFlowModeling dynamicResourceCreation experiment20231128 experiment_2023_1_25 extendForWebServices feature_addLoggerToCFD fix fixSerializeException fix_connectionAnEdgeAtDependsOnMediator forMultipleOutputResources forWebServices hieararchicalLayout htmlGUi importVisualModelingUpdates interfaces langSpecModification master ohta ohta2 ota outputChannelAsAClass refactor simulationLayout simulator swingInterface test two-stage-modeling updateHierarchicalResources

commit 0c1835a7e3b88fb7266c59dee6af4ce8ab85b6a3

2 parents 339a9b1 + e940a5e

yoichiro authored on 6 Apr 2020

Patch

Unified Split

Showing 5 changed files

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/algorithm/CodeGenerator.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/algorithm/EdgeTransitionSelectable.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/PrototypeGenerateAction.java

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

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/tests/CodeGeneratorTest.java

Show line notes below