Added some stuff.

This commit is contained in:
2017-01-14 14:42:00 +01:00
parent 4973868db5
commit 7bf55870b1
6 changed files with 65 additions and 44 deletions

View File

@ -35,6 +35,8 @@ public abstract class AutoTrader {
protected Exchange se;
protected AutoTraderConfig config;
protected String name;
@ -42,12 +44,17 @@ public abstract class AutoTrader {
account_id = se.createAccount(money, shares);
this.se=se;
this.config=config;
this.name="";
}
/*public AutoTrader(Exchange se, double money, double shares){
this(se,money,shares,null);
public void setName(String name){
this.name=name;
}
public String getName(){
return name;
}
*/
public abstract void start();

View File

@ -9,7 +9,7 @@ import sesim.Order_old.OrderType_old;
*
* @author tube
*/
public class Exchange extends Thread {
public class Exchange { //extends Thread {
public enum OrderType {
BID, ASK
@ -23,9 +23,9 @@ public class Exchange extends Thread {
*/
public class Account implements Comparable {
protected double id;
protected double shares;
protected double money;
private double id;
private double shares;
private double money;
private final HashMap<Long, Order> orders;
@ -287,12 +287,13 @@ public class Exchange extends Thread {
while (i.hasNext()) {
i.next().UpdateOrderBook();
}
try {
/* try {
sleep(10);
} catch (InterruptedException e) {
System.out.println("I was Interrupted");
}
*/
}
// Here we store the list of quote receivers
@ -324,7 +325,7 @@ public class Exchange extends Thread {
public TreeSet<Order_old> bid;
public TreeSet<Order_old> ask;
private Locker tradelock = new Locker();
private final Locker tradelock = new Locker();
/*
private final Semaphore available = new Semaphore(1, true);
@ -704,12 +705,12 @@ public class Exchange extends Thread {
if (a == null) {
return -1;
}
tradelock.lock();
Order o = new Order(a, type, volume, limit);
addOrderToBook(o);
a.orders.put(o.id, o);
tradelock.lock();
this.executeOrders();
tradelock.unlock();
this.updateBookReceivers(OrderType.ASK);
@ -842,9 +843,9 @@ public class Exchange extends Thread {
/**
*
*/
@Override
// @Override
public void run() {
while (true) {
/* while (true) {
try {
sleep(1500);
} catch (InterruptedException e) {
@ -853,6 +854,7 @@ public class Exchange extends Thread {
print_current();
}
*/
}
}