diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties index 12e6285..ada0390 100644 --- a/nbproject/private/private.properties +++ b/nbproject/private/private.properties @@ -3,4 +3,4 @@ do.depend=false do.jar=true javac.debug=true javadoc.preview=true -user.properties.file=/home/tube/.netbeans/8.1/build.properties +user.properties.file=/home/tobias/.netbeans/8.1/build.properties diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index e3442b8..d364475 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -3,38 +3,17 @@ - file:/home/tube/NetBeansProjects/SeSim/additional/README.txt - file:/home/tube/NetBeansProjects/SeSim/src/SeSim/Trader.java - file:/home/tube/NetBeansProjects/SeSim/src/SeSim/Locker.java - file:/home/tube/NetBeansProjects/SeSim/src/SeSim/Order.java - file:/home/tube/NetBeansProjects/SeSim/src/Gui/ControlPanel.java - file:/home/tube/NetBeansProjects/SeSim/src/SeSim/Quote.java - file:/home/tube/NetBeansProjects/SeSim/src/Gui/MainWin.java - file:/home/tube/NetBeansProjects/SeSim/src/Gui/OrderBook.java - file:/home/tube/NetBeansProjects/SeSim/manifest.mf - file:/home/tube/NetBeansProjects/SeSim/src/SeSim/TraderConfig.java - file:/home/tube/NetBeansProjects/SeSim/src/SeSim/Account.java - file:/home/tube/NetBeansProjects/SeSim/src/Gui/QuotePanel.java - file:/home/tube/NetBeansProjects/SeSim/src/SeSim/Exchange.java - file:/home/tube/NetBeansProjects/SeSim/src/Gui/NewPanel.java - file:/home/tube/NetBeansProjects/SeSim/src/Gui/Chart.java - file:/home/tube/NetBeansProjects/SeSim/src/Traders/RandomTraderConfig.java - file:/home/tube/NetBeansProjects/SeSim/src/Gui/AskBook.java - file:/home/tube/NetBeansProjects/SeSim/src/SeSim/AutoTrader.java - file:/home/tube/NetBeansProjects/SeSim/src/Gui/BidBook.java - file:/home/tube/NetBeansProjects/SeSim/src/Traders/SwitchingTrader.java - file:/home/tube/NetBeansProjects/SeSim/build.xml - file:/home/tube/NetBeansProjects/SeSim/src/Gui/OrderBookPanel.java - file:/home/tube/NetBeansProjects/SeSim/src/Traders/RandomTrader.java - file:/home/tube/NetBeansProjects/SeSim/src/SeSim/AutoTraderLIst.java - file:/home/tube/NetBeansProjects/SeSim/src/SeSim/BuyOrder.java - file:/home/tube/NetBeansProjects/SeSim/src/Traders/ManTrader.java - file:/home/tube/NetBeansProjects/SeSim/README.md - file:/home/tube/NetBeansProjects/SeSim/src/Gui/CandlestickDemo.java - file:/home/tube/NetBeansProjects/SeSim/src/SeSim/Logger.java - file:/home/tube/NetBeansProjects/SeSim/src/Traders/SwitchingTraderConfig.java - file:/home/tube/NetBeansProjects/SeSim/src/SeSim/SellOrder.java - file:/home/tube/NetBeansProjects/SeSim/LICENSE + file:/home/tobias/NetBeansProjects/SeSim/src/Gui/AskBook.java + file:/home/tobias/NetBeansProjects/SeSim/src/Traders/RandomTraderConfig.java + file:/home/tobias/NetBeansProjects/SeSim/src/Gui/Chart.java + file:/home/tobias/NetBeansProjects/SeSim/src/Traders/RandomTrader.java + file:/home/tobias/NetBeansProjects/SeSim/src/Gui/MainWin.java + file:/home/tobias/NetBeansProjects/SeSim/src/SeSim/Exchange.java + file:/home/tobias/NetBeansProjects/SeSim/nbproject/configs/Sesim.properties + file:/home/tobias/NetBeansProjects/SeSim/nbproject/configs/JWS_generated.properties + file:/home/tobias/NetBeansProjects/SeSim/src/SeSim/AutoTraderLIst.java + file:/home/tobias/NetBeansProjects/SeSim/src/SeSim/SellOrder.java + file:/home/tobias/NetBeansProjects/SeSim/nbproject/build-impl.xml diff --git a/src/Gui/Chart.java b/src/Gui/Chart.java index 525fc0e..d1d3d73 100644 --- a/src/Gui/Chart.java +++ b/src/Gui/Chart.java @@ -118,14 +118,31 @@ public class Chart extends javax.swing.JPanel implements QuoteReceiver { - protected OHLCDataItem getOhlcData(long first, long last, TreeSet quotes ){ + protected OHLCDataItem getOhlcData(long first, long last, SortedSet quotes ){ Quote e=new Quote(); e.time=first; e.id=0; + Quote qq = quotes.first(); + System.out.print(String.format + ("Quote First %f %d %d \n", qq.price,qq.time,qq.id) + ); - SortedSet l = quotes.tailSet(e); + System.out.print("Qzitesn"+quotes.size() +"\n"); + + + + + Quote z = new Quote(); + z.id=-1; + z.time=0; + + + SortedSet l = quotes.tailSet(z); + + System.exit(0); + double open=0; double high=0; double low=0; @@ -169,11 +186,15 @@ public class Chart extends javax.swing.JPanel implements QuoteReceiver { protected OHLCDataItem[] getData() { List data = new ArrayList<>(); - TreeSet s = MainWin.se.getQuoteHistory(60); + SortedSet s = MainWin.se.getQuoteHistory(60); + this.getOhlcData(0, System.currentTimeMillis(), s); + + + Iterator i = s.iterator(); - this.getOhlcData(0, System.currentTimeMillis(), s); + // OHLCDataItem item = new OHLCDataItem(); diff --git a/src/Gui/test.java b/src/Gui/test.java new file mode 100644 index 0000000..782b03e --- /dev/null +++ b/src/Gui/test.java @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2017, tobias + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ +package Gui; + +import java.util.*; + + +/** + * + * @author tobias + */ +public class test { + public static void main(String args[]){ + SortedSet s = new TreeSet<>(); + s.add("b"); + s.add("e"); + s.add("z"); + + SortedSet ts = s.tailSet("d"); + + SortedSet ts2 = ts.tailSet("n"); + + + System.out.print(String.format("First: %s\n", ts2.first())); + } +} diff --git a/src/SeSim/Exchange.java b/src/SeSim/Exchange.java index 6c786ee..484b07b 100644 --- a/src/SeSim/Exchange.java +++ b/src/SeSim/Exchange.java @@ -27,13 +27,27 @@ public class Exchange extends Thread { } - public TreeSet getQuoteHistory(int seconds){ + public SortedSet getQuoteHistory(int seconds){ Quote last = quoteHistory.last(); long ct = last.time - seconds * 1000; Quote e = new Quote(); e.time=ct; + e.time=-1; + e.id=3; + SortedSet qqq =this.quoteHistory; + + SortedSet l = quoteHistory.tailSet(e); - return (TreeSet)l; + e.id=-1; + SortedSet ll = l.tailSet(e); + + int size = qqq.size(); + long fid = qqq.first().id; + + System.out.print("SS0: "+qqq.first().id+"\n"); + + + return ll; } diff --git a/src/SeSim/Quote.java b/src/SeSim/Quote.java index 5099671..2cc120e 100644 --- a/src/SeSim/Quote.java +++ b/src/SeSim/Quote.java @@ -61,9 +61,10 @@ public class Quote implements Comparable { int ret; Quote q = (Quote)o; - ret = (int)(this.time-q.time); + /* ret = (int)(this.time-q.time); if (ret !=0) return ret; + */ return (int)(this.id-q.id); } diff --git a/src/Traders/RandomTraderConfig.java b/src/Traders/RandomTraderConfig.java index 5ee99b5..34d2dbf 100644 --- a/src/Traders/RandomTraderConfig.java +++ b/src/Traders/RandomTraderConfig.java @@ -48,15 +48,15 @@ public class RandomTraderConfig extends TraderConfig { * the minimum and maximum volume to be selled */ public float[] sell_volume= {100,100}; - public float[] sell_limit = {-15,100}; - public int[] sell_order_wait = {5,33}; - public int[] wait_after_sell = {2,10}; + public float[] sell_limit = {-15,15}; + public int[] sell_order_wait = {15,33}; + public int[] wait_after_sell = {10,30}; public float[] buy_volume={100,100}; - public float[] buy_limit = {-5,115}; + public float[] buy_limit = {-15,15}; public int[] buy_order_wait = {15,33}; - public int[] wait_after_buy = {20,33}; + public int[] wait_after_buy = {10,30}; @Override