Some reformatting.

This commit is contained in:
7u83 2016-12-25 21:31:55 +01:00
parent c0676d5b03
commit bdc4f794f5
4 changed files with 60 additions and 53 deletions

View File

@ -1,21 +1,19 @@
package StockExchange;
public class BuyOrder extends Order implements Comparable<Order>{
public int compareTo(Order o){
public class BuyOrder extends Order implements Comparable<Order> {
if (o.limit < limit)
{
//System.out.println("return 1");
return -1;
}
if (o.limit > limit){
//System.out.println("return -1");
return +1;
}
@Override
public int compareTo(Order o) {
if (o.limit < limit) {
//System.out.println("return 1");
return -1;
}
if (o.limit > limit) {
//System.out.println("return -1");
return +1;
}
// System.out.println("0000000000000000000000");
return 0;
}
return 0;
}
}

View File

@ -28,7 +28,7 @@ public class Exchange extends Thread {
}
// Here we store the list of quote receivers
TreeSet<QuoteReceiver> qrlist = new TreeSet<QuoteReceiver>();
TreeSet<QuoteReceiver> qrlist = new TreeSet();
public void AddQuoteReceiver(QuoteReceiver qr) {
qrlist.add(qr);
@ -52,7 +52,7 @@ public class Exchange extends Thread {
long lastsize;
// Order orderlist[];
TreeSet<BuyOrder> bid = new TreeSet<BuyOrder>();
TreeSet<BuyOrder> bid = new TreeSet();
TreeSet<SellOrder> ask = new TreeSet<SellOrder>();
private final Semaphore available = new Semaphore(1, true);

View File

@ -1,41 +1,44 @@
package StockExchange;
public abstract class Order implements Comparable<Order>{
public long timestamp=0;
public long size;
public double limit;
public abstract class Order implements Comparable<Order> {
/**
* when
*/
public long timestamp = 0;
public long size;
public double limit;
// long time;
double money=0;
double money = 0;
// public long shares=0;
public long id=0;
public Account account=null;
enum OrderStatus {
open,executed,canceled
}
OrderStatus status=OrderStatus.open;
public long getAge(){
if (timestamp==0)
return 0;
return System.currentTimeMillis()-timestamp;
}
String format_limit(){
if (limit <0.0){
return "n.a.";
}
return String.format("%.2f",limit);
}
public long id = 0;
public Account account = null;
String format_size(){
return String.format("%d", size);
}
Order(){
}
enum OrderStatus {
open, executed, canceled
}
OrderStatus status = OrderStatus.open;
public long getAge() {
if (timestamp == 0) {
return 0;
}
return System.currentTimeMillis() - timestamp;
}
String format_limit() {
if (limit < 0.0) {
return "n.a.";
}
return String.format("%.2f", limit);
}
String format_size() {
return String.format("%d", size);
}
Order() {
}
}

View File

@ -5,6 +5,8 @@
*/
package sesim;
import StockExchange.*;
/**
*
* @author tube
@ -15,6 +17,10 @@ public class SeSim {
* @param args the command line arguments
*/
public static void main(String[] args) {
Exchange se = new StockExchange.Exchange();
se.start();
// TODO code application logic here
}