7u83/OpenSeSim
1
1
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

produces now exactly the same chart for the same random seed

Browse Source
This commit is contained in:
7u83
2017-02-05 01:19:09 +01:00
parent 7a6f56883d
commit c877d42e41
16 changed files with 90 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/traders/RandomTrader.java
View File

@ -51,8 +51,8 @@ public class RandomTrader extends AutoTrader {
}
public RandomTrader(Exchange se, double money, double shares, RandomTraderConfig config) {
super(se, money, shares, config);
public RandomTrader(Exchange se, long id, String name, double money, double shares, RandomTraderConfig config) {
super(se, id, name,money, shares, config);
if (this.config == null) {
this.config = new RandomTraderConfig();
}
@ -165,10 +165,13 @@ public class RandomTrader extends AutoTrader {
OrderType type = OrderType.BID;
if (ad == null || myconfig == null) {
// System.out.print(ad + "\n");
//System.out.printf("%s: myconf = 0 \n", this.getName());
return 0;
}
//System.out.printf("%s: calling rand for money\n", this.getName());
// how much money we ant to envest?
double money = getRandomAmmount(ad.money, myconfig.buy_volume);
@ -189,6 +192,8 @@ public class RandomTrader extends AutoTrader {
return 0;
}
//System.out.printf("%s: create order %s %f\n", this.getName(),type.toString(),limit);
se.createOrder(account_id, type, volume, limit);
return getRandom(myconfig.buy_wait);
@ -201,6 +206,7 @@ public class RandomTrader extends AutoTrader {
OrderType type = OrderType.ASK;
//System.out.printf("%s: calling rand for volume\n", this.getName());
// how much money we ant to envest?
double volume = (long) getRandomAmmount(ad.shares, myconfig.sell_volume);
@ -219,6 +225,8 @@ public class RandomTrader extends AutoTrader {
// System.out.print("Volume is:"+volume+"\n");
// System.out.print("My Ammount is: "+volume+" My limit si:"+limit+ "\n");
//System.out.printf("%s: create order %s %f\n", this.getName(),type.toString(),limit);
se.createOrder(account_id, type, volume, limit);
return getRandom(myconfig.sell_wait);
@ -235,6 +243,7 @@ public class RandomTrader extends AutoTrader {
return doSell();
}
// System.out.printf("%s: do nothing\n",this.getName());
return 0;
}

4
src/main/java/traders/RandomTraderConfig.java
View File

@ -53,11 +53,11 @@ public class RandomTraderConfig extends AutoTraderBase implements AutoTraderConf
public Long[] wait_after_buy = {10L, 30L};
@Override
public AutoTrader createTrader(Exchange se, JSONObject cfg, double money, double shares) {
public AutoTrader createTrader(Exchange se, JSONObject cfg, long id, String name, double money, double shares) {
if (cfg != null) {
this.putConfig(cfg);
}
return new traders.RandomTrader(se, money, shares, this);
return new traders.RandomTrader(se, id, name, money, shares, this);
}
@Override

2
src/main/java/traders/SuperTraderConfig.java
View File

@ -39,7 +39,7 @@ import sesim.Exchange;
public class SuperTraderConfig implements AutoTraderConfig{
@Override
public AutoTrader createTrader(Exchange se, JSONObject cfg, double money, double shares) {
public AutoTrader createTrader(Exchange se, JSONObject cfg, long id, String name,double money, double shares) {
return null;
}

4
src/main/java/traders/SwitchingTrader.java
View File

@ -36,8 +36,8 @@ public class SwitchingTrader extends RandomTrader {
private int mode;
public SwitchingTrader(Exchange se, double money, double shares, RandomTraderConfig config) {
super(se, money, shares, config);
public SwitchingTrader(Exchange se, long id, String name, double money, double shares, RandomTraderConfig config) {
super(se, id, name, money, shares, config);
}
Action action = Action.RANDOM;

4
src/main/java/traders/SwitchingTraderConfig.java
View File

@ -37,9 +37,9 @@ import sesim.Exchange;
public class SwitchingTraderConfig extends RandomTraderConfig implements AutoTraderConfig {
@Override
public AutoTrader createTrader(Exchange se, JSONObject cfg, double money, double shares) {
public AutoTrader createTrader(Exchange se, JSONObject cfg, long id, String name, double money, double shares) {
return new traders.SwitchingTrader(se, money, shares, this);
return new traders.SwitchingTrader(se, id, name, money, shares, this);
}