Merge lp:~danilovesky/workcraft/trunk-bug-1351503 into lp:workcraft

[Danil Sokolov]

[Danil Sokolov (danilovesky)]

review: Approve

=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/CpogProgrammer.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/CpogProgrammer.java	2014-07-29 11:59:53 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/CpogProgrammer.java	2014-08-04 14:17:33 +0000
@@ -32,19 +32,22 @@
 import org.workcraft.plugins.cpog.optimisation.expressions.Zero;
 import org.workcraft.plugins.cpog.optimisation.javacc.BooleanParser;
 import org.workcraft.plugins.cpog.optimisation.javacc.ParseException;
+import org.workcraft.util.FileUtils;
 import org.workcraft.util.Func;
 import org.workcraft.util.Geometry;
 import org.workcraft.util.Hierarchy;
 import org.workcraft.workspace.WorkspaceEntry;
 
 public class CpogProgrammer {
-	
+	// FIXME: Relative path to the directory with programmer results. Currently this is hard-coded in programmer. 
+	private static final String genEncodingDir = "../tools/results/generated_encoding/";
+
 	private EncoderSettings settings;
 	private File scenarioFile, encodingFile ;
 	private Double minArea;
-	
+
 	// SETTING PARAMETERS FOR CALLING PROGRAMMER
-	private String programmerCommand = "programmer";
+	private String programmerCommand;
 	private String espressoCommand;
 	private String abcFolder;
 	private String gatesLibrary;
@@ -262,10 +265,6 @@
 				abcFolder = "";
 				gateLibFlag = "-lib";
 				gatesLibrary = "";
-				JOptionPane.showMessageDialog(null,
-						"You can download it at http://www.eecs.berkeley.edu/~alanmi/abc/ to improve the outcome of the encoding.",
-						"Abc tool disabled",
-						JOptionPane.INFORMATION_MESSAGE);
 			}
 			
 			// FILL IN PARAMETERS FOR CALLING PROGRAMER PROPERLY
@@ -330,11 +329,10 @@
 					System.out.println("Error");
 			}
 			
-			deleteDir(new File("results/"));
-			File d = new File("results/generated_encoding/");
-			d.mkdirs();
-		
-		// IF SCENCO MODE IS NOT SELECTED, PROGRAMMER IS CALLED ITERATIVELY
+			FileUtils.deleteDirectoryTree(new File(genEncodingDir));
+			new File(genEncodingDir).mkdirs();
+
+			// IF SCENCO MODE IS NOT SELECTED, PROGRAMMER IS CALLED ITERATIVELY
 		// BECAUSE, IF CONTINUOUS OPTION IS SELECTED, TOOL IS CALLED 
 		// TILL USER PRESSES STOP BUTTON
 		if(!SCENCO){	
@@ -673,22 +671,6 @@
 		}
 	}
 	
-	// REMOVE DIRECTORY CONTAINS ALL THE CONTROLLER SYNTHESISED
-	// FOR EACH ENCODING SOLUTION
-	private static boolean deleteDir(File dir) {
-	    if (dir.isDirectory()) {
-	        String[] children = dir.list();
-	        for (int i = 0; i < children.length; i++) {
-	            boolean success = deleteDir(new File(dir, children[i]));
-	            if (!success) {
-	                return false;
-	            }
-	        }
-	    }
-
-	    return dir.delete(); // The directory is empty now and can be deleted.
-	}
-	
 	// BUILD CONSTRAINT FOR EACH ELEMENTS LOOPING ON THE SCENARIOS
 	private String generateConstraint(char [][][] constraints, int numScenarios, int event1, int event2)
 	{
@@ -856,7 +838,7 @@
 	// THE MICROCONTROLLER SYNTHESISED WITH ABC TOOL
 	private void printController(int m){
 		System.out.println();
-		String fileName = "results/generated_encoding/";
+		String fileName = genEncodingDir;
 		for(int i=0; i<m; i++) fileName = fileName.concat(binaryToInt(opt_enc[i]) + "_");
 		fileName = fileName.concat(".prg");
 		File f = new File(fileName);
@@ -896,14 +878,14 @@
 	// TO WORKCRAFT TO BUILD THE COMPOSITIONAL GRAPH
 	private int callingProgrammer(Double currArea, WorkspaceEntry we, int it, boolean continuous) throws IOException{
 		//Debug Printing: launching executable
-		/*System.out.println(programmerCommand + " " + scenarioFile.getAbsolutePath() + " " +
-				"-m" + " " + effort + " " + genMode + " " + numSol + " " + customFlag + " " + customPath + " " + 
-				verbose + " " + cpogSize + " " + disableFunction + " " + oldSynt + " " + 
-				espressoFlag + " " + espressoCommand + " " + abcFlag + " " + abcFolder + " " + gateLibFlag + " " +
-				gatesLibrary);*/
+//		System.out.println(programmerCommand + " " + scenarioFile.getAbsolutePath() + " " +
+//				"-m" + " " + effort + " " + genMode + " " + numSol + " " + customFlag + " " + customPath + " " + 
+//				verbose + " " + cpogSize + " " + disableFunction + " " + oldSynt + " " + 
+//				espressoFlag + " " + espressoCommand + " " + abcFlag + " " + abcFolder + " " + gateLibFlag + " " +
+//				gatesLibrary);
 		process = new ProcessBuilder(programmerCommand, scenarioFile.getAbsolutePath(),
-				"-m",effort,genMode, numSol,customFlag,customPath,verbose,cpogSize,disableFunction,oldSynt,
-				espressoFlag,espressoCommand, abcFlag, abcFolder, gateLibFlag, gatesLibrary).start();
+				"-m", effort, genMode, numSol, customFlag, customPath, verbose, cpogSize, disableFunction, oldSynt,
+				espressoFlag, espressoCommand, abcFlag, abcFolder, gateLibFlag, gatesLibrary).start();
 		InputStream is = process.getInputStream();
 		InputStreamReader isr = new InputStreamReader(is);
 		BufferedReader br = new BufferedReader(isr);
@@ -1069,6 +1051,7 @@
 		opt_formulaeArcs = new String[elements*elements];
 		truthTableArcs =  new String[elements*elements];
 		arcNames = new String[elements*elements];
+		programmerCommand = CpogSettings.getProgrammerCommand();
 		espressoCommand = CpogSettings.getEspressoCommand();
 		abcFolder = CpogSettings.getAbcFolder();
 		gatesLibrary = CpogSettings.getGatesLibrary();
 
=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/CpogSettings.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/CpogSettings.java	2014-07-25 14:53:23 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/CpogSettings.java	2014-08-04 14:17:33 +0000
@@ -38,6 +38,7 @@
 	private static final String keyCircuitSize = prefix + ".circuitSize";
 	private static final String keyClaspCommand = prefix + ".claspCommand";
 	private static final String keyMinisatCommand = prefix + ".minisatCommand";
+	private static final String keyProgrammerCommand = prefix + ".programmerCommand";
 	private static final String keyEspressoCommand = prefix + ".espressoCommand";
 	private static final String keyAbcFolder = prefix + ".abcFolder";
 	private static final String keyGatesLibrary = prefix + ".gatesLibrary";
@@ -46,6 +47,7 @@
 	private static final int defaultCircuitSize = 4;
 	private static final String defaultClaspCommand = "clasp";
 	private static final String defaultMinisatCommand = "minisat";
+	private static final String defaultProgrammerCommand = "programmer";
 	private static final String defaultEspressoCommand = "espresso";
 	private static final String defaultAbcFolder = "abc/";
 	private static final String defaultGatesLibrary = "90nm.genlib";
@@ -54,6 +56,7 @@
 	private static int circuitSize = defaultCircuitSize;
 	private static String claspCommand = defaultClaspCommand;
 	private static String minisatCommand = defaultMinisatCommand;
+	private static String programmerCommand = defaultProgrammerCommand;
 	private static String espressoCommand = defaultEspressoCommand;
 	private static String abcFolder = defaultAbcFolder;
 	private static String gatesLibrary = defaultGatesLibrary;
@@ -100,7 +103,17 @@
 		});
 		
 		properties.add(new PropertyDeclaration<CpogSettings, String>(
-				this, "Espresso solver", String.class) {
+				this, "Programmer command", String.class) {
+			protected void setter(CpogSettings object, String value) {
+				CpogSettings.setProgrammerCommand(value);
+			}
+			protected String getter(CpogSettings object) {
+				return CpogSettings.getProgrammerCommand();
+			}
+		});
+		
+		properties.add(new PropertyDeclaration<CpogSettings, String>(
+				this, "Espresso command", String.class) {
 			protected void setter(CpogSettings object, String value) {
 				CpogSettings.setEspressoCommand(value);
 			}
@@ -136,6 +149,7 @@
 		setCircuitSize(config.getInt(keyCircuitSize, defaultCircuitSize));
 		setClaspCommand(config.getString(keyClaspCommand, defaultClaspCommand));
 		setMinisatCommand(config.getString(keyMinisatCommand, defaultMinisatCommand));
+		setProgrammerCommand(config.getString(keyProgrammerCommand, defaultProgrammerCommand));
 		setEspressoCommand(config.getString(keyEspressoCommand, defaultEspressoCommand));
 		setAbcFolder(config.getString(keyAbcFolder, defaultAbcFolder));
 		setGatesLibrary(config.getString(keyGatesLibrary, defaultGatesLibrary));
@@ -147,6 +161,7 @@
 		config.setInt(keyCircuitSize, getCircuitSize());
 		config.set(keyClaspCommand, getClaspCommand());
 		config.set(keyMinisatCommand, getMinisatCommand());
+		config.set(keyProgrammerCommand, getProgrammerCommand());
 		config.set(keyEspressoCommand, getEspressoCommand());
 		config.set(keyAbcFolder, getAbcFolder());
 		config.set(keyGatesLibrary, getGatesLibrary());
@@ -199,6 +214,14 @@
 		minisatCommand = value;
 	}
 
+	public static String getProgrammerCommand() {
+		return programmerCommand;
+	}
+
+	public static void setProgrammerCommand(String value) {
+		programmerCommand = value;
+	}
+
 	public static String getEspressoCommand() {
 		return espressoCommand;
 	}
 
=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/EncoderSettings.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/EncoderSettings.java	2014-07-29 11:59:53 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/EncoderSettings.java	2014-08-04 14:17:33 +0000
@@ -37,12 +37,6 @@
 			return choice;
 		}
 	}
-	
-	public EncoderSettings(String espressoPath, String abcPath, String libPath) {
-		this.espressoPath = espressoPath;
-		this.abcPath = abcPath;
-		this.libPath = libPath;
-	}
 
 	private int solutionNumber = 10, numPO,bits;
 	private GenerationMode genMode = GenerationMode.OPTIMAL_ENCODING;
@@ -50,6 +44,12 @@
 	private String[] customEnc;
 	private String espressoPath,abcPath,libPath;
 
+	public EncoderSettings(String espressoPath, String abcPath, String libPath) {
+		this.espressoPath = espressoPath;
+		this.abcPath = abcPath;
+		this.libPath = libPath;
+	}
+
 	public boolean isCpogSize() {
 		return cpogSize;
 	}
 
=== modified file 'CpogsPlugin/src/org/workcraft/plugins/cpog/gui/EncoderConfigurationDialog.java'
--- CpogsPlugin/src/org/workcraft/plugins/cpog/gui/EncoderConfigurationDialog.java	2014-07-29 11:59:53 +0000
+++ CpogsPlugin/src/org/workcraft/plugins/cpog/gui/EncoderConfigurationDialog.java	2014-08-04 14:17:33 +0000
@@ -18,7 +18,6 @@
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JDialog;
-import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -36,6 +35,7 @@
 import org.workcraft.plugins.shared.presets.PresetManager;
 import org.workcraft.workspace.WorkspaceEntry;
 
+@SuppressWarnings("serial")
 public class EncoderConfigurationDialog extends JDialog {
 	
 	private JLabel numberOfSolutionsLabel, contLabel,
@@ -45,7 +45,6 @@
 	private JCheckBox verboseModeCheck, customEncodings,
 					 contCheck, abcCheck;
 	private JComboBox generationModeBox,OptimiseBox, guidedModeBox;
-	private JFrame frame;
 	private JPanel generationPanel, buttonsPanel, content;
 	private JButton saveButton, closeButton;
 	private JTextField numberOfSolutionsText, bitsText;
@@ -56,13 +55,11 @@
 	private int m,bits;
 	private JRadioButton slow,normal,fast;
 	private ButtonGroup group;
-	private JPanel speedPanel, encodingPanel;
 	
 	// Core variables
 	private CpogProgrammer encoder;
 	private EncoderSettings settings;
 	private WorkspaceEntry we;
-	private static boolean settingsPresent = false;
 	
 	// sizes
 	Dimension dimensionLabel = new Dimension(270, 22);
@@ -190,7 +187,6 @@
 				}
 				
 				// Set them on encoder
-				settingsPresent = true;
 				encoder = new CpogProgrammer(settings);
 				
 				// Execute programmer
@@ -214,13 +210,12 @@
 	private void createGenerationPanel() {
 		setMinimumSize(new Dimension(600, 400));
 		generationPanel = new JPanel(new SimpleFlowLayout());
-		JPanel numberOfSolutionsPanel = new JPanel (new FlowLayout(FlowLayout.LEFT, 3, 0));
 		VisualCPOG cpog = (VisualCPOG)(we.getModelEntry().getVisualModel());
 		ArrayList<VisualScenario> scenarios = new ArrayList<VisualScenario>(cpog.getGroups());
 		m = scenarios.size();
 		
 		// ABC TOOL DISABLE FLAG
-		abcCheck = new JCheckBox("",settings.isAbcFlag());
+		abcCheck = new JCheckBox("", !settings.isAbcFlag());
 		abcLabel = new JLabel("Disable Abc Tool");
 		abcLabel.setPreferredSize(new Dimension(150, 15));
 		abcCheck.addActionListener(new ActionListener() {
@@ -547,7 +542,6 @@
 		encodingTable.setEnabled(false);
 		encodingTable.setBackground(Color.LIGHT_GRAY);
 		
-		
 		// VERBOSE MODE INSTANTIATION
 		verboseModeLabel = new JLabel("Verbose mode");
 		verboseModeLabel.setPreferredSize(dimensionLabel);
 
=== modified file 'WorkcraftCore/src/org/workcraft/gui/graph/tools/SelectionTool.java'
--- WorkcraftCore/src/org/workcraft/gui/graph/tools/SelectionTool.java	2014-08-01 09:23:25 +0000
+++ WorkcraftCore/src/org/workcraft/gui/graph/tools/SelectionTool.java	2014-08-04 14:17:33 +0000
@@ -63,7 +63,6 @@
 import org.workcraft.dom.visual.VisualGroup;
 import org.workcraft.dom.visual.VisualModel;
 import org.workcraft.dom.visual.VisualModelTransformer;
-import org.workcraft.dom.visual.VisualNode;
 import org.workcraft.dom.visual.VisualPage;
 import org.workcraft.dom.visual.connections.DefaultAnchorGenerator;
 import org.workcraft.exceptions.ArgumentException;
@@ -81,8 +80,6 @@
 	static private final Color selectionBorderColor = new Color(200, 200, 200);
 	static private final Color selectionFillColor = new Color(99, 130, 191, 32);
 	static private final Color grayOutColor = Color.LIGHT_GRAY; 
-	// node for the MouseOver events
-	private VisualNode mouseOverNode = null;
 	
 	protected JPanel interfacePanel;
 	protected JPanel controlPanel;
@@ -235,29 +232,15 @@
 		rotatePanel.add(rotateCounterclockwiseButton);
 	}
 	
-	private void resetState(GraphEditor editor) {
-		mouseOverNode = null;
-	}
-	
-	private void updateState(GraphEditorMouseEvent e) {
-		Point2D mousePosition = e.getPosition();
-		
-		VisualNode node = (VisualNode) HitMan.hitTestForSelection(mousePosition, e.getModel());
-		mouseOverNode = node;
-		
-	}	
-	
 	@Override
 	public void activated(final GraphEditor editor) {
 		super.activated(editor);
 		editor.getWorkspaceEntry().setCanModify(true);
-		resetState(editor);
 	}
 
 	@Override
 	public void deactivated(GraphEditor editor) {
 		editor.getModel().selectNone();
-		resetState(editor);
 	}
 	
 	@Override
@@ -334,13 +317,7 @@
 			selected.addAll(model.boxHitTest(e.getStartPosition(), e.getPosition()));
 			selectionBox = selectionRect(e.getStartPosition(), e.getPosition());
 			e.getEditor().repaint();
-		} else {
-			// "mouse over" events
-			
 		}
-		
-		updateState(e);
-		
 	}
 
 	@Override