Browse Source

ExampleNetwork

Tom 4 years ago
parent
commit
7156bfb35f

+ 7 - 7
exampleNetworks/RandomizerExample/elements.json

@@ -33,7 +33,7 @@
         "maxAmount" : 1,
         "priority" : "Essential",
         "energy" : -450.0,
-        "flexChance" : 0.5,
+        "flexChance" : 0.95,
 	    "minCost" : 300,
 	    "maxCost" : 400,
 	    "minDuration" : 1,
@@ -47,7 +47,7 @@
         "maxAmount" : 1,
         "priority" : "Low",
         "energy" : -300.0,
-        "flexChance" : 0.5,
+        "flexChance" : 0.95,
 	    "minCost" : 100,
 	    "maxCost" : 200,
 	    "minDuration" : 1,
@@ -61,7 +61,7 @@
         "maxAmount" : 1,
         "priority" : "Medium",
         "energy" : -1300.0,
-        "flexChance" : 0.5,
+        "flexChance" : 0.95,
 	    "minCost" : 200,
 	    "maxCost" : 250,
 	    "minDuration" : 1,
@@ -89,7 +89,7 @@
         "maxAmount" : 1,
         "energy" : -500.0,
         "priority" : "Low",
-        "flexChance" : 0.5,
+        "flexChance" : 0.95,
 	    "minCost" : 50,
 	    "maxCost" : 100,
 	    "minDuration" : 1,
@@ -103,7 +103,7 @@
         "maxAmount" : 1,
         "priority" : "Low",
         "energy" : 2000.0,
-        "flexChance" : 0.5,
+        "flexChance" : 0.95,
 	    "minCost" : 120,
 	    "maxCost" : 300,
 	    "minDuration" : 1,
@@ -124,7 +124,7 @@
         "maxAmount" : 1,
         "energy" : -2000.0,
         "priority" : "Medium",
-        "flexChance" : 0.5,
+        "flexChance" : 0.95,
 	    "minCost" : 200,
 	    "maxCost" : 350,
 	    "minDuration" : 1,
@@ -138,7 +138,7 @@
         "maxAmount" : 1,
         "priority" : "Low",
         "energy" : -2500.0,
-        "flexChance" : 0.5,
+        "flexChance" : 0.95,
 	    "minCost" : 100,
 	    "maxCost" : 250,
 	    "minDuration" : 1,

BIN
exampleNetworks/exampleNetWith1600Flexes.holon


+ 1 - 0
src/api/AlgorithmFrameworkFlex.java

@@ -759,6 +759,7 @@ public abstract class AlgorithmFrameworkFlex implements AddOn{
 		}
 		public void stop() {
 			isActive = false;
+			progressBar.setValue(0);
 		}
 		public JProgressBar getJProgressBar(){
 			return progressBar;

+ 0 - 1
src/ui/view/Main.java

@@ -5,7 +5,6 @@ import ui.controller.SingletonControl;
 import ui.model.Model;
 
 import javax.swing.*;
-import javax.swing.UIManager.LookAndFeelInfo;
 
 import java.awt.*;