Display lambdas, add slider

src/history/ExecutionHistory.java

@@ -55,14 +55,14 @@ public void addGeneration(Population pop){
 		this.generations.add(pop);
 	}
 	public Population getGeneration(int pos){
-		return generations.get(pos);
+		return generations.get(Integer.min(pos, generations.size()-1));
 	}
 
 	public ArrayList< ArrayList<ReferencePoint> > getLambdaDirectionsHistory() {
 		return lambdaGenerations;
 	}
 	public ArrayList<ReferencePoint> getLambdaDirections(int id){
-		return lambdaGenerations.get(id);
+		return lambdaGenerations.get(Integer.min(id,lambdaGenerations.size()-1));
 	}
 	public void addLambdas(ArrayList<ReferencePoint>  lambdaDirections){
 		this.lambdaGenerations.add(lambdaDirections);

src/org/xdat/actionListeners/parallelCoordinatesChartFrame/ParallelChartContextMenuActionListener.java

@@ -143,6 +143,13 @@ else if (actionCommand.equals("hideAxis")) {
 				chart.getAxis(i).resetFilters();
 			}
 			this.chartFrame.repaint();
+		} else if (actionCommand.equals("setAllFiltersAsAxis")) {
+			ParallelCoordinatesChart chart = this.axis.getChart();
+			for (int i = 0; i < chart.getAxisCount(); i++) {
+				chart.getAxis(i).setFilterAsNewRange();
+				this.chartFrame.repaint();
+			}
+			this.chartFrame.repaint();
 		} else if (actionCommand.equals("reduceDistanceAllAxes")) {
 			ParallelCoordinatesChart chart = this.axis.getChart();
 			for (int i = 0; i < chart.getAxisCount(); i++) {

src/org/xdat/data/DataSheet.java

@@ -44,6 +44,7 @@
 import org.xdat.exceptions.InconsistentDataException;
 
 import core.Population;
+import core.points.ReferencePoint;
 import core.points.Solution;
 import history.ExecutionHistory;
 
@@ -257,13 +258,10 @@ private void importData(int generationId, ProgressMonitor progressMonitor){
 		int idCounter = 1;
 		Population pop = ExecutionHistory.getInstance().getGeneration(generationId);
 
-		Design newDesign = new Design(idCounter++);
 		for (int i = 0; i < ExecutionHistory.getInstance().getNumObjectives(); i++) {
 			this.parameters.add(new Parameter("f" + (i+1), this));
-			newDesign.setValue(this.parameters.get(i), "0.0");
 		}
-		this.data.add(newDesign);
-		this.designIdsMap.put(newDesign.getId(), newDesign);
+		Design newDesign = new Design(idCounter++);
 
 		for(Solution s : pop.getSolutions()){
 			progressMonitor.setProgress(idCounter - 1);
@@ -274,6 +272,27 @@ private void importData(int generationId, ProgressMonitor progressMonitor){
 			this.data.add(newDesign);
 			this.designIdsMap.put(newDesign.getId(), newDesign);
 		}
+
+		for(ReferencePoint rp : ExecutionHistory.getInstance().getLambdaDirections(generationId)){
+			progressMonitor.setProgress(idCounter);
+			newDesign = new Design(idCounter++);
+			for (int i = 0; i < ExecutionHistory.getInstance().getNumObjectives(); i++) {
+				newDesign.setValue(this.parameters.get(i), String.valueOf(rp.getDim(i)));
+			}
+			this.data.add(newDesign);
+			this.designIdsMap.put(newDesign.getId(), newDesign);
+		}
+
+		Design zero = new Design(idCounter + 1);
+		Design one = new Design(idCounter + 2);
+		for (int i = 0; i < ExecutionHistory.getInstance().getNumObjectives(); i++) {
+			zero.setValue(this.parameters.get(i), "0.0");
+			one.setValue(this.parameters.get(i), "1.0");
+		}
+		this.data.add(zero);
+		this.data.add(one);
+		this.designIdsMap.put(zero.getId(), zero);
+		this.designIdsMap.put(one.getId(), one);
 
 		if (progressMonitor.isCanceled()) {
 			this.data = buffer;
@@ -423,7 +442,7 @@ public void updateData(int generationId, ProgressMonitor progressMonitor){
 
 		progressMonitor.setMaximum(ExecutionHistory.getInstance().getPopulationSize());
 
-		int idCounter = 1;
+		int idCounter = 0;
 		Population pop = ExecutionHistory.getInstance().getGeneration(generationId);
 
 		progressMonitor.setMaximum(pop.size());
@@ -445,6 +464,27 @@ public void updateData(int generationId, ProgressMonitor progressMonitor){
 			this.data.add(newDesign);
 			this.designIdsMap.put(newDesign.getId(), newDesign);
 		}
+
+		for(ReferencePoint rp : ExecutionHistory.getInstance().getLambdaDirections(generationId)){
+			progressMonitor.setProgress(idCounter);
+			newDesign = new Design(idCounter++);
+			for (int i = 0; i < ExecutionHistory.getInstance().getNumObjectives(); i++) {
+				newDesign.setValue(this.parameters.get(i), String.valueOf(rp.getDim(i)));
+			}
+			this.data.add(newDesign);
+			this.designIdsMap.put(newDesign.getId(), newDesign);
+		}
+
+		Design zero = new Design(idCounter + 1);
+		Design one = new Design(idCounter + 2);
+		for (int i = 0; i < ExecutionHistory.getInstance().getNumObjectives(); i++) {
+			zero.setValue(this.parameters.get(i), "0.0");
+			one.setValue(this.parameters.get(i), "1.0");
+		}
+		this.data.add(zero);
+		this.data.add(one);
+		this.designIdsMap.put(zero.getId(), zero);
+		this.designIdsMap.put(one.getId(), one);
 
 		if (progressMonitor.isCanceled()) {
 			this.data = buffer;

src/org/xdat/gui/menus/parallelCoordinatesChart/ParallelCoordinatesContextMenu.java

@@ -157,6 +157,12 @@ public ParallelCoordinatesContextMenu(Main mainWindow, ChartFrame chartFrame, Ax
 		resetAllFiltersMenuItem.setActionCommand("resetAllFilters");
 		resetAllFiltersMenuItem.addActionListener(cmd);
 		this.add(resetAllFiltersMenuItem);
+
+		// set all filters as new axis range
+		JMenuItem setAllFiltersAsRangeMenuItem = new JMenuItem("Set all filters as axis range");
+		setAllFiltersAsRangeMenuItem.setActionCommand("setAllFiltersAsAxis");
+		setAllFiltersAsRangeMenuItem.addActionListener(cmd);
+		this.add(setAllFiltersAsRangeMenuItem);
 
 		// increase distance
 		JMenuItem increaseDistanceAllAxesMenuItem = new JMenuItem("Increase spacing all axes                               ");

src/org/xdat/gui/panels/ParallelCoordinatesChartSidebarPanel.java

@@ -205,7 +205,7 @@ protected void buildPanel(JPanel parentPanel) {
 			this.activeDesignAlphaSlider.setEnabled(false);
 		}
 
-		this.generationsSlider = new JSlider(JSlider.HORIZONTAL, 0, ExecutionHistory.getInstance().getNumGenerations() - 1, 0);
+		this.generationsSlider = new JSlider(JSlider.HORIZONTAL, 0, ExecutionHistory.getInstance().getNumGenerations()-1, 0);
 
 		this.generationsSlider.addChangeListener(new ChangeListener() {