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

code cleaning, speedup of trader loading

Browse Source
This commit is contained in:
7u83
2017-04-16 16:34:51 +02:00
parent dca1851212
commit c3eeb16431
9 changed files with 51 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/sesim/AutoTraderLoader.java
View File

@ -307,37 +307,36 @@ public class AutoTraderLoader {
return this.getDefaultStrategyNames(true);
}
public AutoTraderInterface getStrategyBase(String name) {
public AutoTraderInterface getAutoTraderInterface(String name) {
ArrayList<Class<AutoTraderInterface>> traders = this.getInstalledTraders();
System.out.printf("Installed traders %d\n", traders.size());
// System.exit(0);
for (int i = 0; i < traders.size(); i++) {
try {
traders.get(i).getCanonicalName();
if (!name.equals(traders.get(i).getCanonicalName())){
// System.out.printf("Contnue trader\n");
continue;
}
// System.out.printf("Canon name %s\n", traders.get(i).getCanonicalName());
// System.exit(0);
Globals.LOGGER.info(String.format("Making lll instance of %s", traders.get(i).getCanonicalName()));
// Globals.LOGGER.info(String.format("Making lll instance of %s", traders.get(i).getCanonicalName()));
if (traders.get(i)==null){
Globals.LOGGER.info("We have null");
}
// if (traders.get(i)==null){
// Globals.LOGGER.info("We have null");
// }
// AutoTraderInterface ac = traders.get(i).newInstance();
AutoTraderInterface ac = this.MakeInstance(traders.get(i));
AutoTraderInterface ac = MakeInstance(traders.get(i));
System.out.printf("Looking for in %s == %s\n", ac.getClass().getCanonicalName(), name);
return ac;
// System.out.printf("Looking for in %s == %s\n", ac.getClass().getCanonicalName(), name);
if (ac.getClass().getCanonicalName().equals(name)) {
return ac;
// if (ac.getClass().getCanonicalName().equals(name)) {
// return ac;
// if (ac.getDisplayName().equals(name)) {
// return ac;}
}
// }
} catch (Exception ex) {
Globals.LOGGER.info(String.format("Instance failed %s", ex.getMessage()));
}

2
src/sesim/Exchange.java
View File

@ -1155,7 +1155,7 @@ public class Exchange {
buy_failed++;
break;
}
System.out.printf("Order ffailed %f %f \n",o.volume,o.limit);
// System.out.printf("Order ffailed %f %f \n",o.volume,o.limit);
return -1;

6
src/sesim/Scheduler.java
View File

@ -294,10 +294,10 @@ public class Scheduler extends Thread {
// if (evtime == null) {
// return;
// }
System.out.printf("Cancel my %d\n", e.id);
SortedSet<TimerTaskDef> s = event_queue.get(e.curevtime);
if (s == null) {
System.out.printf("My not found\n");
// System.out.printf("My not found\n");
return;
}
@ -391,7 +391,7 @@ public class Scheduler extends Thread {
while (!set_tasks.isEmpty()) {
TimerTaskDef td = set_tasks.poll();
System.out.printf("There is a set task %d %d\n",td.curevtime,td.newevtime);
// System.out.printf("There is a set task %d %d\n",td.curevtime,td.newevtime);
this.cancelMy(td);
this.addTimerTask(td);