Commit 56dd76ea by Alan White

update stats

parent 43cf41f7
......@@ -3,7 +3,7 @@
MAS twtest {
//note; other infrastructures not tested or supported
infrastructure: Centralised
environment: truckworld.env.Cargoworld("paperWorld2.properties", "nrisk2/ndebil025.properties", "6", "none")
environment: truckworld.env.Cargoworld("paperWorld2.properties", "nrisk1/ndebil025.properties", "6", "none")
/* Agent args;
knownAgents - if set, defines a fixed list of agents from whom we receive capability notices. If
......
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
......@@ -161,8 +161,9 @@ public class WorldUi extends JFrame implements WindowListener, ActionListener {
loadImageIcons(e);
env = e;
this.createAutoStartThread();
if(UniversalConstants.AUTO_START_SIM) {
createAutoStartThread();
}
final JMenuBar mb = new JMenuBar();
JMenu options = new JMenu("Debug/options");
......
......@@ -14,7 +14,7 @@ import common.UniversalConstants;
import truckworld.env.Cargoworld;
import truckworld.world.World;
import truckworld.world.interfaces.JunctionInf;
import truckworld.world.simulatedConditions.rain.ProbabalisticRainController;
import truckworld.world.simulatedConditions.rain.ProbabilisticRainController;
import truckworld.world.simulatedConditions.rain.RainController;
import truckworld.world.simulatedConditions.rain.RainStorm;
......@@ -26,7 +26,7 @@ public class EnvStepper extends ParamUser implements Stepper {
private final Random random;
private final Cargoworld env;
private final RainController rainController;
private final ProbabalisticRainController probRainController;
private final ProbabilisticRainController probRainController;
private final Point2D windVector = new Point2D.Double(0d,0d);
private final float windyChangeChance, closeRoadChance, openRoadChance, addDzChance, removeDzChance, proportionMaxBlocked;
......@@ -78,8 +78,7 @@ public class EnvStepper extends ParamUser implements Stepper {
closedLastTime = new Vector<>();
dzAddedLastTime = new Vector<>();
stormMode = getBooleanParam(propFile, Param.stormMode);
probRainController = new ProbabalisticRainController(env, propFile);
//new EnvStepperControl(this);
probRainController = new ProbabilisticRainController(env, propFile);
}
private Map<String, Integer> initalizeDzProhibitMap() {
......
......@@ -17,7 +17,7 @@ import truckworld.env.Cargoworld;
import truckworld.world.interfaces.RoadInf;
import truckworld.world.simulatedConditions.ParamUser;
public class ProbabalisticRainController extends ParamUser {
public class ProbabilisticRainController extends ParamUser {
private final Logger logger;
private final Random random;
private final Cargoworld env;
......@@ -25,7 +25,7 @@ public class ProbabalisticRainController extends ParamUser {
private final float floodChance, dryChance;
private final int maxSlippery, maxFlooded, maxDryPerTurn, maxFloodPerTurn;
public ProbabalisticRainController(final Cargoworld env, final Properties propFile) {
public ProbabilisticRainController(final Cargoworld env, final Properties propFile) {
this.logger = Logger.getLogger(this.getClass().getName());
logger.setLevel(UniversalConstants.ENV_LOGGER_LEVEL);
this.env = env;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment