Merge remote-tracking branch 'origin/commonToControlFlowAndDependencyModelings' into integrateControlFlowGraphIntoLatest

Fork: 1

nitta-lab / AlgebraicDataflowArchitectureModel

Browse code Merge remote-tracking branch 'origin/commonToControlFlowAndDependencyModelings' into integrateControlFlowGraphIntoLatest # Conflicts: # AlgebraicDataflowArchitectureModel/src/application/simulator/InputEventCellEditor.java # AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java # AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java # AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/ControlFlowGraph.java hierarchical-control-flow-modeling
commit 71d96b59fc007dc672fc03f03ed038d6c7aa1431 2 parents 6d561f3 + a9307b1 Shohei Yamagiwa authored 1 day ago

Browse code

# Conflicts:
#	AlgebraicDataflowArchitectureModel/src/application/simulator/InputEventCellEditor.java
#	AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java
#	AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
#	AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/ControlFlowGraph.java

hierarchical-control-flow-modeling

commit 71d96b59fc007dc672fc03f03ed038d6c7aa1431

2 parents 6d561f3 + a9307b1

Shohei Yamagiwa authored 1 day ago

Patch

Unified Split

Showing 6 changed files

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/application/simulator/InputEventCellEditor.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/models/algebra/Term.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/models/controlFlowModel/ControlFlowGraph.java

Ignore Space Show notes View AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java

Show line notes below