diff --git a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyModelingStage.java b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyModelingStage.java index 406c148..7c597ef 100644 --- a/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyModelingStage.java +++ b/AlgebraicDataflowArchitectureModel/src/application/editor/stages/DependencyModelingStage.java @@ -14,6 +14,7 @@ import generators.JavaCodeGenerator; import models.Edge; import models.algebra.*; +import models.controlFlowModel.ControlFlowGraph; import models.dataConstraintModel.Channel; import models.dataConstraintModel.ChannelMember; import models.dataConstraintModel.ResourcePath; @@ -73,7 +74,8 @@ model = prevStage.getModel(); DataFlowGraph dataFlowGraph = ((PushPullSelectionStage) prevStage).getDataFlowGraph(); - dependencyGraph = new DependencyGraph(dataFlowGraph, model); + ControlFlowGraph controlFlowGraph = new ControlFlowGraph(dataFlowGraph, model); + dependencyGraph = new DependencyGraph(controlFlowGraph, model); resNodeToCell = ((PushPullSelectionStage) prevStage).getResNodeToCell(); eventChannelToCell = ((PushPullSelectionStage) prevStage).getEventChannelToCell(); diff --git a/AlgebraicDataflowArchitectureModel/src/models/dependencyModel/DependencyGraph.java b/AlgebraicDataflowArchitectureModel/src/models/dependencyModel/DependencyGraph.java index d8cf154..f121580 100644 --- a/AlgebraicDataflowArchitectureModel/src/models/dependencyModel/DependencyGraph.java +++ b/AlgebraicDataflowArchitectureModel/src/models/dependencyModel/DependencyGraph.java @@ -13,8 +13,7 @@ import java.util.Set; public class DependencyGraph extends DirectedGraph implements IFlowGraph { - private DataFlowGraph dataFlowGraph; - private ControlFlowGraph controlFlowGraph; + private final ControlFlowGraph controlFlowGraph; private DirectedGraph dependencyGraph; @@ -30,15 +29,12 @@ } } - //ControlFlowGraphが統合できるまでのサンプル 統合次第削除 - public DependencyGraph(DataFlowGraph dataFlowGraph, DataTransferModel model){ - this.dataFlowGraph = dataFlowGraph; - + public DataFlowGraph getDataFlowGraph(){ + return controlFlowGraph.getDataFlowGraph(); } - public DataFlowGraph getDataFlowGraph(){ - // return controlFlowGraph.getDataFlowGraph(); - return dataFlowGraph; + public ControlFlowGraph getControlFlowGraph(){ + return controlFlowGraph; } @Override