weight changes

src/algorithm/objectiveFunction/TopologieObjectiveFunction.java

@@ -15,7 +15,7 @@ public class TopologieObjectiveFunction {
 	//Parameters
 	
 	//weight for f_g(H)
-	static double w_eb = 0.4, w_max = 0.2, w_holon= 0.2, w_selection = .1, w_grid = 0.1;
+	static double w_eb = 0.3, w_max = 0.2, w_holon= 0.2, w_selection = .1, w_grid = 0.2;
 	
 	
 	//--> f_eb parameter

src/api/TopologieAlgorithmFramework.java

@@ -139,7 +139,7 @@ public abstract class TopologieAlgorithmFramework implements AddOn{
 	private JPanel createOptionPanel() {
 		JPanel optionPanel = new JPanel(new BorderLayout());
 		JScrollPane scrollPane = new JScrollPane(createParameterPanel());
-		scrollPane.setBorder(BorderFactory.createTitledBorder("Parameter"));
+		scrollPane.setBorder(BorderFactory.createTitledBorder("Parameters"));
 		optionPanel.add(scrollPane,  BorderLayout.CENTER);
 		optionPanel.add(createButtonPanel(), BorderLayout.PAGE_END);
 		return optionPanel;
@@ -149,8 +149,8 @@ public abstract class TopologieAlgorithmFramework implements AddOn{
 		JPanel parameterPanel = new JPanel(null);
 		parameterPanel.setPreferredSize(new Dimension(510,300));
 		borderPanel.setLayout(new BoxLayout(borderPanel, BoxLayout.PAGE_AXIS));
-		addIntParameter("Rounds", rounds, intInput -> rounds = intInput, () -> rounds, 1);
-		addIntParameter("amountOfNewCables", amountOfNewCables, intInput -> amountOfNewCables = intInput, () -> amountOfNewCables, 0);
+		addIntParameter("Repetitions", rounds, intInput -> rounds = intInput, () -> rounds, 1);
+		addIntParameter("Number of New Cables", amountOfNewCables, intInput -> amountOfNewCables = intInput, () -> amountOfNewCables, 0);
 		JScrollPane scrollPane = new JScrollPane(borderPanel);
 		scrollPane.setBounds(10, 0, 850, 292);
 		scrollPane.setBorder(BorderFactory.createEmptyBorder());