UpdateConflictCheckTestを変更、全アルゴリズムをデバッグ中

Fork: 1

y-ota / AlgebraicDataflowArchitectureModel

forked from nitta-lab/AlgebraicDataflowArchitectureModel

Browse code UpdateConflictCheckTestを変更、全アルゴリズムをデバッグ中 fix master ohta ohta2 ota
1 parent c2c153d commit 5c6d7de3eca17ebd533e2e28618f83809c580911 yoichiro authored on 25 Mar 2020

Patch

Unified Split

Showing 4 changed files

                Ignore Space
               Show notes
              View
            
          
          3 ■■■■■
          AlgebraicDataflowArchitectureModel/src/algorithm/DataStorageDecision.java
+		}
	}
 
	static private void trackNode(ResourceNode resource) {
		if(arrivedNode.contains(resource)) return;
		if (arrivedNode.contains(resource)) return;
		arrivedNode.add(resource);
		boolean flag = false;
		for (Edge e : resource.getInEdges()) {
			if (((PushPullAttribute) e.getAttribute()).getOptions().get(0) == PushPullValue.PUSH) {
				trackNode((ResourceNode) e.getSource());
				flag = true;
			}
		}
		if (resource.getInEdges().size() == 0) flag = true;
		((StoreAttribute) resource.getAttribute()).setStored(flag);
	}
}
 		}
 	}
 	static private void trackNode(ResourceNode resource) {
+		if(arrivedNode.contains(resource)) return;
+		if (arrivedNode.contains(resource)) return;
 		arrivedNode.add(resource);
 		boolean flag = false;
 		for (Edge e : resource.getInEdges()) {
 			if (((PushPullAttribute) e.getAttribute()).getOptions().get(0) == PushPullValue.PUSH) {
 				trackNode((ResourceNode) e.getSource());
 				flag = true;
 			}
 		}
+		if (resource.getInEdges().size() == 0) flag = true;
 		((StoreAttribute) resource.getAttribute()).setStored(flag);
 	}
 }

                Ignore Space
               Show notes
              View
            
          
          28 ■■■■■
          AlgebraicDataflowArchitectureModel/src/algorithm/UpdateConflictCheck.java
 import java.util.*;
 
import models.*;
import models.dataConstraintModel.ChannelGenerator;
import models.dataConstraintModel.ChannelMember;
import models.dataConstraintModel.IdentifierTemplate;
import models.dataFlowModel.DataFlowModel;
import models.dataFlowModel.DataflowChannelGenerator;
import models.dataConstraintModel.*;
import models.dataFlowModel.*;
 
public class UpdateConflictCheck {
	private int index = 0;
	private Deque<Node> stack = new ArrayDeque<>();
	private Set<Set<Node>> strong = new HashSet<>();
	private Map<Node, Integer> ids = new HashMap<>();
	private Map<Node, Integer> lowlink = new HashMap<>();
	private Map<Node, Boolean> onStack = new HashMap<>();
	private static int index = 0;
	private static Deque<Node> stack = new ArrayDeque<>();
	private static Set<Set<Node>> strong = new HashSet<>();
	private static Map<Node, Integer> ids = new HashMap<>();
	private static Map<Node, Integer> lowlink = new HashMap<>();
	private static Map<Node, Boolean> onStack = new HashMap<>();
 
	private void init() {
	static private void init() {
		index = 0;
		stack = new ArrayDeque<>();
		strong = new HashSet<>();
		ids = new HashMap<>();
		lowlink = new HashMap<>();
		onStack = new HashMap<>();
	}
 
	private void strongconnect(Node node) {
	static private void strongconnect(Node node) {
		ids.put(node, index);
		lowlink.put(node, index);
		index++;
		stack.push(node);
			strong.add(tmp);
		}
	}
 
	public boolean run(DataFlowModel model) {
	static public boolean run(DataFlowModel model) {
		init();
		boolean check = true;
		for (Node node : model.getResourceDependencyGraph().getNodes()) {
			if (ids.containsKey(node)) {
 import java.util.*;
 import models.*;
+import models.dataConstraintModel.ChannelGenerator;
+import models.dataConstraintModel.ChannelMember;
+import models.dataConstraintModel.IdentifierTemplate;
+import models.dataFlowModel.DataFlowModel;
+import models.dataFlowModel.DataflowChannelGenerator;
+import models.dataConstraintModel.*;
+import models.dataFlowModel.*;
 public class UpdateConflictCheck {
+	private int index = 0;
+	private Deque<Node> stack = new ArrayDeque<>();
+	private Set<Set<Node>> strong = new HashSet<>();
+	private Map<Node, Integer> ids = new HashMap<>();
+	private Map<Node, Integer> lowlink = new HashMap<>();
+	private Map<Node, Boolean> onStack = new HashMap<>();
+	private static int index = 0;
+	private static Deque<Node> stack = new ArrayDeque<>();
+	private static Set<Set<Node>> strong = new HashSet<>();
+	private static Map<Node, Integer> ids = new HashMap<>();
+	private static Map<Node, Integer> lowlink = new HashMap<>();
+	private static Map<Node, Boolean> onStack = new HashMap<>();
+	private void init() {
+	static private void init() {
 		index = 0;
 		stack = new ArrayDeque<>();
 		strong = new HashSet<>();
 		ids = new HashMap<>();
 		lowlink = new HashMap<>();
 		onStack = new HashMap<>();
 	}
+	private void strongconnect(Node node) {
+	static private void strongconnect(Node node) {
 		ids.put(node, index);
 		lowlink.put(node, index);
 		index++;
 		stack.push(node);
 			strong.add(tmp);
 		}
 	}
+	public boolean run(DataFlowModel model) {
+	static public boolean run(DataFlowModel model) {
 		init();
 		boolean check = true;
 		for (Node node : model.getResourceDependencyGraph().getNodes()) {
 			if (ids.containsKey(node)) {

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

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

Show line notes below