Fonseca-Fleming example up and running

Author: Admin

JSimpleSim/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>

JSimpleSim/src/org/simplesim/examples/fonseca/FonsecaChart.java

@@ -24,25 +24,29 @@
 import org.knowm.xchart.style.markers.SeriesMarkers;
 
 /**
+ * Class to display chart, pareto front and xy-series of algorithm
  */
 public class FonsecaChart {
 
+	private final static int VISIBLE_DOTS=20;
+	
 	private final XYChart chart;
 	private final Deque<Double> f1=new ArrayDeque<>();
 	private final Deque<Double> f2=new ArrayDeque<>();
 
 	private final SwingWrapper<XYChart> sw;
 
 	public FonsecaChart(String title) {
-		chart=new XYChartBuilder().width(800).height(600).title(title).xAxisTitle("X")
-				.yAxisTitle("Y").theme(ChartTheme.Matlab).build();
+		chart=new XYChartBuilder().width(800).height(600).title(title).theme(ChartTheme.Matlab).build();
 
 		// Customize Chart
 		chart.getStyler().setDefaultSeriesRenderStyle(XYSeriesRenderStyle.Scatter);
 		chart.getStyler().setChartTitleVisible(false);
 		chart.getStyler().setLegendVisible(false);
-		chart.getStyler().setAxisTitlesVisible(false);
+		chart.getStyler().setAxisTitlesVisible(true);
 		chart.getStyler().setXAxisDecimalPattern("0.0");
+		chart.setXAxisTitle("f1(x)");
+		chart.setYAxisTitle("f2(x)");
 
 		XYSeries series=chart.addSeries("Algorithm",new double[1],new double[1]);
 		series.setMarkerColor(Color.BLUE);
@@ -59,13 +63,11 @@ public void addParetoFront(double[] f1pareto, double[] f2pareto) {
 		series.setMarker(SeriesMarkers.DIAMOND);
 	}
 
-	private final int BUFFER_SIZE=20;
-
 	public void update(double x1, double x2) {
 		f1.addFirst(x1);
-		while (f1.size()>BUFFER_SIZE) f1.removeLast();
+		while (f1.size()>VISIBLE_DOTS) f1.removeLast();
 		f2.addFirst(x2);
-		while (f2.size()>BUFFER_SIZE) f2.removeLast();
+		while (f2.size()>VISIBLE_DOTS) f2.removeLast();
 		chart.updateXYSeries("Algorithm",new ArrayList<>(f1),new ArrayList<>(f2),null);
 		sw.repaintChart();
 	}

JSimpleSim/src/org/simplesim/examples/fonseca/Main.java

@@ -11,10 +11,10 @@
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
 
-import org.simplesim.decisionmaking.AspirationAdaptation;
-import org.simplesim.decisionmaking.AspirationAdaptation.Action;
-import org.simplesim.decisionmaking.AspirationAdaptation.GoalVariable;
-import org.simplesim.decisionmaking.AspirationAdaptation.STRATEGY;
+import org.simplesim.reasoning.AspirationAdaptation;
+import org.simplesim.reasoning.AspirationAdaptation.Action;
+import org.simplesim.reasoning.AspirationAdaptation.GoalVariable;
+import org.simplesim.reasoning.AspirationAdaptation.STRATEGY;
 
 /**
  * Testing the aspiration adaptation strategy by a three-parameter optimization
@@ -35,7 +35,7 @@ public class Main {
 
 	private static final NumberFormat nf2=NumberFormat.getInstance();
 	private static final NumberFormat nf6=NumberFormat.getInstance();
-	private static final int PARETO_SIZE=50; // number of dots for pareto front
+	private static final int PARETO_DOTS=50; // number of dots for pareto front
 	private static final double a=1/Math.sqrt(3.0d);
 	private static final int dim=2; // number of goal variables
 
@@ -54,10 +54,10 @@ public Main() {
 	}
 
 	private void addParetoFront() {
-		final double[] f1pareto=new double[PARETO_SIZE];
-		final double[] f2pareto=new double[PARETO_SIZE];
-		for (int i=0; i<PARETO_SIZE; i++) {
-			double f1=Math.exp(-4)+(i*((1-(2*Math.exp(-4)))/PARETO_SIZE));
+		final double[] f1pareto=new double[PARETO_DOTS];
+		final double[] f2pareto=new double[PARETO_DOTS];
+		for (int i=0; i<PARETO_DOTS; i++) {
+			double f1=Math.exp(-4)+(i*((1-(2*Math.exp(-4)))/PARETO_DOTS));
 			f1pareto[i]=f1;
 			f2pareto[i]=Math.exp(-Math.pow(2-Math.sqrt(-Math.log(f1)),2));
 		}
@@ -136,6 +136,10 @@ private void run() {
 		}
 	}
 
+	// value calculation of the Fonseca-Fleming function 
+	public static double f1(double x[]) { return Math.exp(-Math.pow(x[0]-a,2)-Math.pow(x[1]-a,2)-Math.pow(x[2]-a,2)); }
+	public static double f2(double x[]) { return Math.exp(-Math.pow(x[0]+a,2)-Math.pow(x[1]+a,2)-Math.pow(x[2]+a,2)); }
+
 	public static void main(String[] args) {
 		nf2.setMaximumFractionDigits(2);
 		nf2.setMinimumFractionDigits(2);
@@ -145,8 +149,4 @@ public static void main(String[] args) {
 		test.run();
 	}
 
-	public double f1(double x[]) { return Math.exp(-Math.pow(x[0]-a,2)-Math.pow(x[1]-a,2)-Math.pow(x[2]-a,2)); }
-
-	public double f2(double x[]) { return Math.exp(-Math.pow(x[0]+a,2)-Math.pow(x[1]+a,2)-Math.pow(x[2]+a,2)); }
-
 }

JSimpleSim/src/org/simplesim/decisionmaking/AspirationAdaptation.java renamed to JSimpleSim/src/org/simplesim/reasoning/AspirationAdaptation.java

@@ -4,7 +4,7 @@
  *
  * Contributors: - Rene Kuhlemann - development and initial implementation
  */
-package org.simplesim.decisionmaking;
+package org.simplesim.reasoning;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;

JSimpleSim/src/org/simplesim/decisionmaking/package-info.java renamed to JSimpleSim/src/org/simplesim/reasoning/package-info.java

@@ -2,4 +2,4 @@
  *  Methods for decision-making and reasoning
  *
  */
-package org.simplesim.decisionmaking;
+package org.simplesim.reasoning;