Fixed setting data dependencies for write variables

Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/prioritization/PrioritizationService.java

 package de.fhmuenster.masterthesis.Testgenerator.prioritization;
 
+import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -44,7 +45,7 @@ public class PrioritizationService {
 		
 		readVariablesOldDSL = this.getReadVariables(this.oldDSL);
 		writeVariablesOldDSL = this.getWriteVariables(this.oldDSL);
-		
+				
 		readVariablesNewDSL = this.getReadVariables(this.newDSL);
 		writeVariablesNewDSL = this.getWriteVariables(this.newDSL);
 		
@@ -80,17 +81,33 @@ public class PrioritizationService {
 		
 		this.sumDependencies(dependenciesNew, dependenciesOld);
 		
-		this.dumpDependencyList();		
+		this.dumpDependencyList(this.newDSL.getFlows());		
+		try {
+			this.newDSL.serialize();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 	
-	private void dumpDependencyList()
+	private void dumpDependencyList(List<Flow> flows)
 	{
-		for (Entry<String, Integer> entry : this.dependencyList.entrySet()) {
-		    String 	flowName 	= entry.getKey();
-		    Integer weight 		= entry.getValue();
-		    
-		    System.out.println("Flow " + flowName + " with Dependency " + weight);
+		for(Flow f: flows) {
+			for (Entry<String, Integer> entry : this.dependencyList.entrySet()) {
+				
+			    String 	flowName 	= entry.getKey();
+			    Integer weight 		= entry.getValue();
+
+				if(f.getName().equals(flowName)) {
+					f.setDependency(weight);
+				    System.out.println("Flow " + flowName + " with Dependency " + f.getDependency());
+				} 
+			}
+			if(this.dependencyList.entrySet().isEmpty()) {
+				f.setDependency(0);
+			}
 		}
+		
 	}
 	
 	private void sumDependencies(HashMap<String, Integer> firstList, HashMap<String, Integer> secondList)
@@ -196,7 +213,6 @@ public class PrioritizationService {
 												String currentWrite = write.getRef().getName();
 												if(currentWrite == checkWriteDependencyVar)										// Variable existiert in dem Flow, Dependency gefunden
 												{
-													System.out.println("Dependcy found!");
 													countDependency++;
 												}
 											}
@@ -229,7 +245,6 @@ public class PrioritizationService {
 		
 		HashMap<String, List<String>> mapOLD = new HashMap<>();
 		HashMap<String, List<String>> mapNEW = new HashMap<>();		
-		
 		for(Map.Entry<String, List<VariableReference>> entry : newDSL.entrySet())
 		{
 			String key = entry.getKey();
@@ -238,9 +253,9 @@ public class PrioritizationService {
 			
 		    for(VariableReference var : vars) 
 		    {
-		    	list.add(var.getRef().getName());
-		    }
-		    
+		    	if(var != null)
+		    		list.add(var.getRef().getName());
+		    }		    
 		    mapNEW.put(key, list);
 		}
 		
@@ -252,37 +267,51 @@ public class PrioritizationService {
 			
 		    for(VariableReference var : vars) 
 		    {
-		    	list.add(var.getRef().getName());
+		    	if(var != null) {
+		    		list.add(var.getRef().getName());
+
+		    	}
+
 		    }		
-		    
 	    	mapOLD.put(key, list);
 		}
+		
 				
 		HashMap<String, List<String>> returnMap = new HashMap<>();
+		List<String> listOldVars = new ArrayList<String>();
+		for(Map.Entry<String, List<String>> entry : mapNEW.entrySet())
+		{	
+			listOldVars.addAll(entry.getValue());
+		}
+		
+		List<String> listNewVars = new ArrayList<String>();
+		for(Map.Entry<String, List<String>> entry : mapOLD.entrySet())
+		{	
+			listNewVars.addAll(entry.getValue());
+		}
+//		System.out.println("TEST LIST: " + testList);
 		
 		if(mapNEW.equals(mapOLD) == false)
 		{		
 			for(Map.Entry<String, List<String>> entry : mapNEW.entrySet())
 			{							
 				String flowElementNew		= entry.getKey();
-				List<String> listNewVars 	= entry.getValue();
-				
 				if(mapOLD.containsKey(flowElementNew))
 				{
-					for(int i = 0; i < listNewVars.size(); i++)
+					for(int i = 0; i < listOldVars.size(); i++)
 					{
-						String varNEW = listNewVars.get(i);
-						
+						String varNEW = listOldVars.get(i);
+
 						for(Map.Entry<String, List<String>> entryOld : mapOLD.entrySet())
 						{
 							if(entryOld.getKey().equals(flowElementNew))
-							{
-								List<String> listOldVars 	= entryOld.getValue();
-								
-								for(int j = 0; j < listOldVars.size(); j++)
-								{
-									String varOLD = listOldVars.get(j);
+							{								
+								for(int j = 0; j < listNewVars.size(); j++)
 									
+								{
+
+									String varOLD = listNewVars.get(j);
+
 									if(varOLD.equals(varNEW))
 									{
 										listOldVars.remove(varOLD);
@@ -294,7 +323,6 @@ public class PrioritizationService {
 					}
 				}	
 			}
-			
 			returnMap.putAll(mapOLD);
 			returnMap.putAll(mapNEW);
 		}
@@ -320,7 +348,7 @@ public class PrioritizationService {
 			for(Flow f: flows) 
 			{
 				List<FlowElementReference> fer = f.getInclElements();
-	
+				
 				for(FlowElementReference flowElementReference: fer)
 				{
 					FlowElement flowElement = flowElementReference.getRef();

Testgenerator/src/main/java/de/fhmuenster/masterthesis/Testgenerator/rest/service/test/TestService.java

@@ -218,7 +218,6 @@ public class TestService {
 				variables.forEach(var -> serializer.addVariable(var));
 				externalTopics.forEach(externalTopic -> serializer.addExternalTopic(externalTopic));
 				flows.forEach(flow -> serializer.addFlow(flow));
-				setDataDependencies(flows, bpmnIOParameters);
 				serializer.serialize();
 			}
 
@@ -227,24 +226,6 @@ public class TestService {
 		}
 	}
 	
-	public void setDataDependencies(List<Flow> flows, BPMNIOParameters bpmnIOParams) {
-		for(Flow f: flows) {
-			int dependencies = 0;
-			List<FlowElementReference> fer = f.getInclElements();
-			for(FlowElementReference flowElementReference: fer) {
-				FlowElement flowElement = flowElementReference.getRef();
-				int inputVariableSize = bpmnIOParams.getInputVariables(flowElement.getName()).size();
-				int outputVariableSize = bpmnIOParams.getOutputVariables(flowElement.getName()).size();
-				if(inputVariableSize != 0) {
-					dependencies += inputVariableSize;
-				}
-				if(outputVariableSize != 0) {
-					dependencies += outputVariableSize;
-				}
-			}
-			f.setDependency(dependencies);
-		}
-	}
 
 	public void addTest(BPMNTestcase testcase, ProjectDirectories projectDirectories) {
 		Path testspecificationPath = ProjectDirectoryUtils.getTestspecificationPath(projectDirectories);