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

Added @override annotations

This commit is contained in:
7u83 2018-12-29 21:57:49 +01:00
parent ed07bd5819
commit b5cf77abbd
3 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nbproject/project.properties
View File

@ -1,4 +1,4 @@
#Sat, 29 Dec 2018 19:58:50 +0100 #Sat, 29 Dec 2018 21:04:02 +0100
annotation.processing.enabled=true annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false annotation.processing.enabled.in.editor=false
annotation.processing.processors.list= annotation.processing.processors.list=
@ -114,4 +114,4 @@ source.encoding=UTF-8
src.dir=src src.dir=src
test.src.dir=test test.src.dir=test
ivy.home=/usr/share/java ivy.home=/usr/share/java
ivy.classpath=lib/gson-2.8.5-javadoc.jar\:lib/gson-2.8.5-sources.jar\:lib/gson-2.8.5.jar\:lib/jackson-annotations-2.9.0.jar\:lib/jackson-core-2.9.7-javadoc.jar\:lib/jackson-core-2.9.7-sources.jar\:lib/jackson-core-2.9.7.jar\:lib/jackson-databind-2.9.7-javadoc.jar\:lib/jackson-databind-2.9.7-sources.jar\:lib/jackson-databind-2.9.7.jar\:lib/javahelp-2.0.05-javadoc.jar\:lib/javahelp-2.0.05-sources.jar\:lib/javahelp-2.0.05.jar\:lib/json-20160810-javadoc.jar\:lib/json-20160810-sources.jar\:lib/json-20160810.jar ivy.classpath=lib/commons-cli-1.0-javadoc.jar\:lib/commons-cli-1.0-sources.jar\:lib/commons-cli-1.0.jar\:lib/commons-lang-2.0-javadoc.jar\:lib/commons-lang-2.0-sources.jar\:lib/commons-lang-2.0.jar\:lib/commons-logging-1.0.jar\:lib/gson-2.8.5-javadoc.jar\:lib/gson-2.8.5-sources.jar\:lib/gson-2.8.5.jar\:lib/jackson-annotations-2.9.0.jar\:lib/jackson-core-2.9.7-javadoc.jar\:lib/jackson-core-2.9.7-sources.jar\:lib/jackson-core-2.9.7.jar\:lib/jackson-databind-2.9.7-javadoc.jar\:lib/jackson-databind-2.9.7-sources.jar\:lib/jackson-databind-2.9.7.jar\:lib/javahelp-2.0.05-javadoc.jar\:lib/javahelp-2.0.05-sources.jar\:lib/javahelp-2.0.05.jar\:lib/json-20160810-javadoc.jar\:lib/json-20160810-sources.jar\:lib/json-20160810.jar

19
src/opensesim/world/SimpleTrader.java
View File

@ -25,23 +25,8 @@
*/ */
package opensesim.world; package opensesim.world;
import opensesim.world.AbstractAsset;
import opensesim.world.AbstractTrader;
import opensesim.world.AssetPair;
import opensesim.world.Exchange;
import opensesim.world.Order;
import opensesim.world.TradingAPI;
import opensesim.world.World;
import opensesim.util.scheduler.Event; import opensesim.util.scheduler.Event;
import opensesim.util.scheduler.EventListener; import opensesim.util.scheduler.EventListener;
import opensesim.world.AbstractAsset;
import opensesim.world.AbstractTrader;
import opensesim.world.Account;
import opensesim.world.AssetPair;
import opensesim.world.Exchange;
import opensesim.world.Order;
import opensesim.world.TradingAPI;
import opensesim.world.World;
import org.json.JSONObject; import org.json.JSONObject;
/** /**
@ -125,8 +110,8 @@ public class SimpleTrader extends AbstractTrader implements EventListener {
api = ex.getAPI(p); api = ex.getAPI(p);
Order oa = api.createOrder(account_b, Order.Type.BUY, 200, 0); Order oa = api.createOrder(account_b, Order.Type.BUYLIMIT, 200, 100);
Order ob = api.createOrder(account_s, Order.Type.SELL, 100, 0); Order ob = api.createOrder(account_s, Order.Type.SELLLIMIT, 200,200);
// Order oa = api.createOrder(account_b, Order.Type.BUYLIMIT, 100, 10.0); // Order oa = api.createOrder(account_b, Order.Type.BUYLIMIT, 100, 10.0);

3
src/opensesim/world/TradingEngine.java
View File

@ -250,11 +250,12 @@ class TradingEngine implements TradingAPI {
this.checkSLOrders(price); this.checkSLOrders(price);
} }
*/ */
// //
// Match limited orders against limited orders // Match limited orders against limited orders
// //
if (bidbook.isEmpty() || askbook.isEmpty()) { if (bidbook.isEmpty() || askbook.isEmpty()) {
// no orders at all, nothing to do // no limit orders at all, nothing to do
break; break;
} }