Merge lp:~libowen96/workcraft/trunk-son-time-intermediate into lp:~libowen96/workcraft/trunk-son-alter

[Bowen Li]

=== modified file 'SONPlugin/src/org/workcraft/plugins/son/SON.java'
--- SONPlugin/src/org/workcraft/plugins/son/SON.java	2015-10-05 19:59:54 +0000
+++ SONPlugin/src/org/workcraft/plugins/son/SON.java	2015-12-25 22:57:38 +0000
@@ -185,7 +185,7 @@
 		}
 	}
 	
-	public void refreshColor(){
+	public void refreshAllColor(){
 		for(Node n:  getComponents()){
 			setFillColor(n,CommonVisualSettings.getFillColor());
 			setForegroundColor(n, CommonVisualSettings.getBorderColor());
@@ -206,6 +206,25 @@
 		}
 	}
 	
+	public void refreshNodeColor(){
+		for(Node n:  getComponents()){
+			setFillColor(n,CommonVisualSettings.getFillColor());
+			setForegroundColor(n, CommonVisualSettings.getBorderColor());
+			setTokenColor(n, Color.BLACK);
+		}
+		for (ONGroup group : this.getGroups()){
+			setForegroundColor(group, SONSettings.getGroupForegroundColor());
+		}
+		
+		for (SONConnection con : this.getSONConnections()){
+			setForegroundColor(con, CommonVisualSettings.getBorderColor());
+		}
+		for (Block block : this.getBlocks()){
+			setFillColor(block, CommonVisualSettings.getFillColor());
+			setForegroundColor(block,  CommonVisualSettings.getBorderColor());
+		}
+	}
+	
 	public void setTimeColor(Node n, Color color){
 		if(n instanceof PlaceNode){
 			((PlaceNode) n).setDurationColor(color);
 
=== modified file 'SONPlugin/src/org/workcraft/plugins/son/algorithm/EstimationAlg.java'
--- SONPlugin/src/org/workcraft/plugins/son/algorithm/EstimationAlg.java	2015-10-09 16:21:17 +0000
+++ SONPlugin/src/org/workcraft/plugins/son/algorithm/EstimationAlg.java	2015-12-25 22:57:38 +0000
@@ -41,6 +41,8 @@
 	private Before before;
 	private Granularity g;
 	private Color color =Color.ORANGE;
+	private Collection<Path> fwdPaths = new ArrayList<Path>();
+	private Collection<Path> bwdPaths = new ArrayList<Path>();
 	
 	public EstimationAlg(SON net, Interval d, Granularity g, ScenarioRef s) {
 		super(net);
@@ -83,7 +85,7 @@
 		return scenario;
 	}
 	
-	public void twoDirEstimation(Node n) throws AlternativeStructureException, TimeEstimationException, TimeOutOfBoundsException, TimeInconsistencyException{
+	public void twoDirEstimation(Node n, boolean interm) throws AlternativeStructureException, TimeEstimationException, TimeOutOfBoundsException, TimeInconsistencyException{
 		ConsistencyAlg alg = new ConsistencyAlg(net);
 		Time node = null;
 		
@@ -242,7 +244,7 @@
 			}else if(start == null && end == null){
 				throw new TimeEstimationException("cannot find causally time values.");
 			}
-			
+						
 			if(iCons.size() == 0){
 				node.setStartTime(start);
 				if(node instanceof Condition){
@@ -256,7 +258,7 @@
 					((Condition) node).setEndTimeColor(color);
 				}
 			}	
-
+				
 			iCons.removeAll(iSpec);
 			for(SONConnection con : iCons){
 				con.setTime(start);
@@ -268,12 +270,54 @@
 				con.setTime(end);
 				con.setTimeLabelColor(color);
 			}
+			
+			if(interm) intermediateEst();
+			
 			if(!alg.nodeConsistency(node, start, end, node.getDuration(), g).isEmpty()){	
 				throw new TimeInconsistencyException("Warning: Estimated start and end times are inconsistent.");
 			}
 		}	
 	}
+	
+	private void intermediateEst() throws TimeOutOfBoundsException{
 
+		for(Path path : fwdPaths){
+			for(int i = 1;  i < path.size(); i++){
+				Time n = (Time)path.get(i);
+				if(!n.getDuration().isSpecified()){
+					n.setDuration(defaultDuration);
+				}
+				SONConnection preCon = net.getSONConnection(path.get(i-1), path.get(i));
+				Interval time = granularity.plusTD(preCon.getTime(), n.getDuration());
+				if( (i+1) < path.size()){
+					SONConnection postCon = net.getSONConnection(path.get(i), path.get(i+1));
+					postCon.setTime(time);
+					postCon.setTimeLabelColor(color);
+				}
+			}
+		}
+		
+		fwdPaths.clear();
+		
+		for(Path path : bwdPaths){
+			for(int i = 1;  i < path.size(); i++){			
+				Time n = (Time)path.get(i);
+				if(!n.getDuration().isSpecified()){
+					n.setDuration(defaultDuration);
+				}
+				SONConnection preCon = net.getSONConnection(path.get(i-1), path.get(i));
+				Interval time = granularity.subtractTD(preCon.getTime(), n.getDuration());
+				if( (i+1) < path.size()){
+					SONConnection postCon = net.getSONConnection(path.get(i), path.get(i+1));
+					postCon.setTime(time);
+					postCon.setTimeLabelColor(color);
+				}
+			}
+		}
+		
+		bwdPaths.clear();
+		
+	}
 	
 	private boolean hasConflict(){
 		RelationAlgorithm alg = new RelationAlgorithm(net);
@@ -596,6 +640,10 @@
         	result[0] = visited.getLast().getEndTime();
         	result[1] = durationAccumulator1(visited);
             resultTimeAndDuration.add(result);	
+            
+           	Path path = new Path();
+            path.addAll(visited);
+            fwdPaths.add(path);
         }
         
         // examine post nodes
@@ -611,6 +659,11 @@
             	result[0] = con.getTime();
             	result[1] = durationAccumulator1(visited);
                 resultTimeAndDuration.add(result);	
+                
+            	Path path = new Path();
+                visited.addLast(node);
+                path.addAll(visited);
+                fwdPaths.add(path);
             }
         }
         // in depth-first, recursion needs to come after visiting post nodes
@@ -633,8 +686,11 @@
         	Interval[] result = new Interval[2];
         	result[0] = visited.getLast().getStartTime();
         	result[1] = durationAccumulator1(visited);
-        	
             resultTimeAndDuration.add(result);
+            
+           	Path path = new Path();
+            path.addAll(visited);
+            bwdPaths.add(path);
         }
         
         // examine post nodes
@@ -649,7 +705,12 @@
             	Interval[] result = new Interval[2];
             	result[0] = con.getTime();
             	result[1] = durationAccumulator1(visited);
-                resultTimeAndDuration.add(result);			
+                resultTimeAndDuration.add(result);		
+                
+            	Path path = new Path();
+                visited.addLast(node);
+                path.addAll(visited);
+                bwdPaths.add(path);
             }
         }
         // in depth-first, recursion needs to come after visiting post nodes
@@ -682,22 +743,6 @@
     	return result;
     }
     
-//    private Interval durationAccumulator2 (LinkedList<Time> visited){
-//    	Interval result = new Interval(0000, 0000);
-//    	Time first = visited.getFirst();
-//    	Time last =  visited.getLast();
-//    	for(Time time : visited){
-//    		if(time != first || time != last){
-//	    		if (time.getDuration().isSpecified())
-//	    			result = result.add(time.getDuration());
-//	    		else{
-//	    			result = result.add(defaultDuration);
-//	    		}
-//    		}
-//    	}
-//    	return result;
-//    }
-    
     private LinkedList<Time> getCausalPreset(Time n, Collection<Node> nodes){
     	LinkedList<Time> preSet = new LinkedList<Time>();
     	LinkedList<Time> result = new LinkedList<Time>();
 
=== modified file 'SONPlugin/src/org/workcraft/plugins/son/gui/ParallelSimDialog.java'
--- SONPlugin/src/org/workcraft/plugins/son/gui/ParallelSimDialog.java	2015-10-05 19:59:54 +0000
+++ SONPlugin/src/org/workcraft/plugins/son/gui/ParallelSimDialog.java	2015-12-25 22:57:38 +0000
@@ -220,7 +220,7 @@
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				run = 1;
-				net.refreshColor();
+				net.refreshAllColor();
 				setVisible(false);				
 			}
 		});
@@ -231,7 +231,7 @@
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				run = 2;
-				net.refreshColor();
+				net.refreshAllColor();
 				setVisible(false);	
 			}
 		});
@@ -304,7 +304,7 @@
 		{
 		  public void windowClosing(WindowEvent e)
 		  {
-			  getSONModel().refreshColor();
+			  getSONModel().refreshAllColor();
 		  }
 		});
 		
 
=== modified file 'SONPlugin/src/org/workcraft/plugins/son/gui/TimeConsistencyDialog.java'
--- SONPlugin/src/org/workcraft/plugins/son/gui/TimeConsistencyDialog.java	2015-10-05 19:59:54 +0000
+++ SONPlugin/src/org/workcraft/plugins/son/gui/TimeConsistencyDialog.java	2015-12-25 22:57:38 +0000
@@ -212,7 +212,7 @@
 		
 		selectionTabbedPane.addChangeListener(new ChangeListener() {
 	        public void stateChanged(ChangeEvent e) {
-	        	 net.refreshColor();
+	        	 net.refreshAllColor();
 	    		 addAllButton.setEnabled(true);
 	    		 removeAllButton.setEnabled(true);
 	    		 int index = getTabIndex();
 
=== modified file 'SONPlugin/src/org/workcraft/plugins/son/gui/TimeEstimatorDialog.java'
--- SONPlugin/src/org/workcraft/plugins/son/gui/TimeEstimatorDialog.java	2015-10-06 16:44:57 +0000
+++ SONPlugin/src/org/workcraft/plugins/son/gui/TimeEstimatorDialog.java	2015-12-25 22:57:38 +0000
@@ -49,7 +49,7 @@
 	
 	protected JPanel buttonsPanel, durationPanel;
 	protected JButton runButton, cancelButton;
-	protected JCheckBox setDuration;
+	protected JCheckBox setDuration, intermediate;
 	protected Dimension buttonSize = new Dimension(80, 25);
 	protected int run = 0;
 	
@@ -82,18 +82,23 @@
 	}
 	
 	protected void createDurationPanel(){	
-		setDuration = new JCheckBox("Set default value for all unspecifed nodes");
+		setDuration = new JCheckBox("Set default duration for all unspecifed nodes");
 		setDuration.setSelected(false);
 		setDuration.setLayout(new FlowLayout(FlowLayout.LEFT));
 		
+		intermediate = new  JCheckBox("Set values for intermediate nodes");
+		intermediate.setSelected(false);
+		intermediate.setLayout(new FlowLayout(FlowLayout.LEFT));
+		
 		defaultDurationPanel = new DefaultDurationPanel(settings.getDuration());
 		defaultDurationPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
 		
 		durationPanel = new JPanel();
 		//durationPanel.setBorder(BorderFactory.createTitledBorder("Default Duration Setting"));
-		durationPanel.setLayout(new GridLayout(2,0));
+		durationPanel.setLayout(new GridLayout(3,0));
 		durationPanel.add(defaultDurationPanel);
 		durationPanel.add(setDuration);
+		durationPanel.add(intermediate);
 	}
 
 	protected void createScenarioTable(){
@@ -173,7 +178,7 @@
 						alg.setDefaultDuration();
 					
 					try {
-						alg.twoDirEstimation(selection);
+						alg.twoDirEstimation(selection, intermediate.isSelected());
 					} catch (AlternativeStructureException e1) {
 						errMsg(e1.getMessage());
 					} catch (TimeEstimationException e1) {
 
=== modified file 'SONPlugin/src/org/workcraft/plugins/son/tools/ColorResetTool.java'
--- SONPlugin/src/org/workcraft/plugins/son/tools/ColorResetTool.java	2014-09-29 17:07:11 +0000
+++ SONPlugin/src/org/workcraft/plugins/son/tools/ColorResetTool.java	2015-12-25 22:57:38 +0000
@@ -21,7 +21,7 @@
 	
 	public void run(WorkspaceEntry we){
 		SON net=(SON)we.getModelEntry().getMathModel();
-		net.refreshColor();
+		net.refreshAllColor();
 	}
 	
 }
 
=== modified file 'SONPlugin/src/org/workcraft/plugins/son/tools/SONSimulationTool.java'
--- SONPlugin/src/org/workcraft/plugins/son/tools/SONSimulationTool.java	2015-10-14 18:26:17 +0000
+++ SONPlugin/src/org/workcraft/plugins/son/tools/SONSimulationTool.java	2015-12-25 22:57:38 +0000
@@ -863,7 +863,7 @@
 	}
 	
 	protected void setDecoration(Step enabled){
-		net.refreshColor();
+		net.refreshAllColor();
 		
 		for(TransitionNode e : enabled){
 			//e.setFillColor(CommonSimulationSettings.getEnabledForegroundColor());
 
=== modified file 'SONPlugin/src/org/workcraft/plugins/son/tools/ScenarioGeneratorTool.java'
--- SONPlugin/src/org/workcraft/plugins/son/tools/ScenarioGeneratorTool.java	2015-10-05 19:59:54 +0000
+++ SONPlugin/src/org/workcraft/plugins/son/tools/ScenarioGeneratorTool.java	2015-12-25 22:57:38 +0000
@@ -86,7 +86,7 @@
 		//workcraft invoke this method before activate method
 		visualNet = (VisualSON)editor.getModel();	
 		net = (SON)visualNet.getMathModel();
-		net.refreshColor();
+		net.refreshAllColor();
 		
 		startButton = SONGUI.createIconToggleButton(GUI.createIconFromSVG("images/icons/svg/son-scenario-start.svg"), "Generate");
 		resetButton = GUI.createIconButton(GUI.createIconFromSVG("images/icons/svg/son-scenario-reset.svg"), "Reset");
@@ -237,7 +237,7 @@
 		}else{
 			scenarioRef.clear();
 			net.clearMarking();
-			net.refreshColor();
+			net.refreshAllColor();
 			scenarioTable.setIsCellColor(false);
 			saveList.setPosition(0);
 			scenarioGenerator(editor);
@@ -272,7 +272,7 @@
 		BlockConnector.blockInternalConnector(visualNet);
 		exportScenarios();	
 		scenarioRef.clear();
-		net.refreshColor();
+		net.refreshAllColor();
 		net.clearMarking();
 	}
 	
 
=== modified file 'SONPlugin/src/org/workcraft/plugins/son/tools/StructurePropertyChecker.java'
--- SONPlugin/src/org/workcraft/plugins/son/tools/StructurePropertyChecker.java	2015-09-27 18:17:29 +0000
+++ SONPlugin/src/org/workcraft/plugins/son/tools/StructurePropertyChecker.java	2015-12-25 22:57:38 +0000
@@ -35,7 +35,7 @@
 		final Framework framework = Framework.getInstance();
 		final MainWindow mainWindow = framework.getMainWindow();
 
-		net.refreshColor();
+		net.refreshAllColor();
 		StructureVerifyDialog dialog = new StructureVerifyDialog(mainWindow, we);
 		GUI.centerToParent(dialog, mainWindow);
 		dialog.setVisible(true);
@@ -46,6 +46,6 @@
 			SONMainTask sonTask = new SONMainTask(dialog.getSettings(), we);			
 			framework.getTaskManager().queue(sonTask, "Verification");
 		}
-		net.refreshColor();
+		net.refreshAllColor();
 	}
 }
 
=== modified file 'SONPlugin/src/org/workcraft/plugins/son/tools/TimeConsistencyChecker.java'
--- SONPlugin/src/org/workcraft/plugins/son/tools/TimeConsistencyChecker.java	2015-09-27 18:17:29 +0000
+++ SONPlugin/src/org/workcraft/plugins/son/tools/TimeConsistencyChecker.java	2015-12-25 22:57:38 +0000
@@ -40,7 +40,7 @@
 		SON net = (SON)we.getModelEntry().getMathModel();
 		
 		BlockConnector.blockBoundingConnector(visualNet);
-		net.refreshColor();
+		net.refreshAllColor();
 		TimeConsistencyDialog dialog = new TimeConsistencyDialog(mainWindow, we);
 		GUI.centerToParent(dialog, mainWindow);
 		dialog.setVisible(true);
@@ -52,7 +52,7 @@
 		}
 		
 		if(dialog.getTabIndex() !=1){
-			net.refreshColor();
+			net.refreshAllColor();
 		}
 		
 		BlockConnector.blockInternalConnector(visualNet);
 
=== modified file 'SONPlugin/src/org/workcraft/plugins/son/tools/TimeValueSetterTool.java'
--- SONPlugin/src/org/workcraft/plugins/son/tools/TimeValueSetterTool.java	2015-10-06 23:26:41 +0000
+++ SONPlugin/src/org/workcraft/plugins/son/tools/TimeValueSetterTool.java	2015-12-25 22:57:38 +0000
@@ -553,7 +553,7 @@
 		timeAlg = new ConsistencyAlg(net);
 		settings = new TimeEstimatorSettings();
 		
-		net.refreshColor();
+		net.refreshAllColor();
 		net.clearMarking();		
 		
 		//set property states for initial and final states
@@ -574,13 +574,13 @@
 			timeAlg.removeProperties();
 		}
 		SONSettings.setTimeVisibility(visibility);
-		net.refreshColor();
+		net.refreshAllColor();
 		net.clearMarking();
 	}
 
 	@Override
 	public void mousePressed(GraphEditorMouseEvent e){	
-		net.refreshColor();
+		net.refreshNodeColor();
 		
 		Node node = HitMan.hitTestForConnection(e.getPosition(), e.getModel().getRoot());
 		if( node instanceof VisualSONConnection){
@@ -591,6 +591,7 @@
 			if(con.getSemantics()==Semantics.PNLINE){
 				((VisualSONConnection) node).setColor(selectedColor);
 				updateTimePanel(e.getEditor(), node);
+				net.setTimeColor(selection, Color.BLACK);
 				return;
 			}
 		}
@@ -603,6 +604,7 @@
 				estimatorButton.setEnabled(true);
 				((VisualBlock) node2).setForegroundColor(selectedColor);
 				updateTimePanel(e.getEditor(), node2);
+				net.setTimeColor(selection, Color.BLACK);
 				return;
 			}
 		}
@@ -622,6 +624,7 @@
 				visualSelection = node3;
 				((VisualComponent) node3).setForegroundColor(selectedColor);
 				updateTimePanel(e.getEditor(), node3);
+				net.setTimeColor(selection, Color.BLACK);
 			}
 	}