|
From: Márcio V. d. S. <mv...@us...> - 2007-10-15 20:23:23
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/graphics In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21382/src/test/net/sf/tail/graphics Modified Files: CashFlowDatasetTest.java ChartForReportTest.java SeriesDatasetTest.java StockAndCashFlowDatasetTest.java ChartTest.java CombinedSeriesAndFlowChartTest.java StockAndCashFlowChartTest.java Log Message: refatoração gigante! Stock virou TimeSeries Index: ChartTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/ChartTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ChartTest.java 23 Aug 2007 12:51:10 -0000 1.5 --- ChartTest.java 15 Oct 2007 20:23:24 -0000 1.6 *************** *** 7,11 **** import java.io.FileInputStream; import java.io.FileNotFoundException; - import java.io.IOException; import java.util.ArrayList; import java.util.List; --- 7,10 ---- *************** *** 14,17 **** --- 13,17 ---- import javax.swing.JPanel; + import net.sf.tail.DummyStock; import net.sf.tail.Indicator; import net.sf.tail.OperationType; *************** *** 126,134 **** TimeSeries timeSeries = null; try { ! timeSeries = ctsl.load(new FileInputStream("BaseBovespa/15min/ambv4.csv"), ""); } catch (FileNotFoundException e) { e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); } return timeSeries; --- 126,132 ---- TimeSeries timeSeries = null; try { ! timeSeries = new DummyStock(ctsl.load(new FileInputStream("BaseBovespa/15min/ambv4.csv"), "")); } catch (FileNotFoundException e) { e.printStackTrace(); } return timeSeries; Index: StockAndCashFlowChartTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/StockAndCashFlowChartTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** StockAndCashFlowChartTest.java 27 Aug 2007 22:46:29 -0000 1.5 --- StockAndCashFlowChartTest.java 15 Oct 2007 20:23:24 -0000 1.6 *************** *** 5,13 **** import java.io.FileInputStream; import java.io.FileNotFoundException; - import java.io.IOException; import java.util.List; import javax.swing.JPanel; import net.sf.tail.Indicator; import net.sf.tail.OperationType; --- 5,13 ---- import java.io.FileInputStream; import java.io.FileNotFoundException; import java.util.List; import javax.swing.JPanel; + import net.sf.tail.DummyStock; import net.sf.tail.Indicator; import net.sf.tail.OperationType; *************** *** 85,93 **** TimeSeries timeSeries = null; try { ! timeSeries = ctsl.load(new FileInputStream("BaseBovespa/diario/aces4Dia.csv"), ""); } catch (FileNotFoundException e) { e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); } return timeSeries; --- 85,91 ---- TimeSeries timeSeries = null; try { ! timeSeries = new DummyStock(ctsl.load(new FileInputStream("BaseBovespa/diario/aces4Dia.csv"), "")); } catch (FileNotFoundException e) { e.printStackTrace(); } return timeSeries; Index: SeriesDatasetTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/SeriesDatasetTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SeriesDatasetTest.java 23 Aug 2007 12:51:10 -0000 1.5 --- SeriesDatasetTest.java 15 Oct 2007 20:23:24 -0000 1.6 *************** *** 6,9 **** --- 6,10 ---- import java.util.List; + import net.sf.tail.DummyStock; import net.sf.tail.Indicator; import net.sf.tail.Operation; *************** *** 42,46 **** ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 4d)); ! series = new DefaultTimeSeries(ticks); indicators = new LinkedList<Indicator<? extends Number>>(); trades = new LinkedList<Trade>(); --- 43,47 ---- ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 4d)); ! series = new DummyStock(new DefaultTimeSeries(ticks)); indicators = new LinkedList<Indicator<? extends Number>>(); trades = new LinkedList<Trade>(); Index: CombinedSeriesAndFlowChartTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/CombinedSeriesAndFlowChartTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CombinedSeriesAndFlowChartTest.java 23 Aug 2007 12:51:10 -0000 1.4 --- CombinedSeriesAndFlowChartTest.java 15 Oct 2007 20:23:24 -0000 1.5 *************** *** 7,11 **** import java.io.FileInputStream; import java.io.FileNotFoundException; - import java.io.IOException; import java.util.ArrayList; import java.util.List; --- 7,10 ---- *************** *** 14,17 **** --- 13,17 ---- import javax.swing.JPanel; + import net.sf.tail.DummyStock; import net.sf.tail.Indicator; import net.sf.tail.OperationType; *************** *** 107,115 **** TimeSeries timeSeries = null; try { ! timeSeries = ctsl.load(new FileInputStream("BaseBovespa/15min/ambv4.csv"), ""); } catch (FileNotFoundException e) { e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); } return timeSeries; --- 107,113 ---- TimeSeries timeSeries = null; try { ! timeSeries = new DummyStock(ctsl.load(new FileInputStream("BaseBovespa/15min/ambv4.csv"), "")); } catch (FileNotFoundException e) { e.printStackTrace(); } return timeSeries; Index: ChartForReportTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/ChartForReportTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ChartForReportTest.java 23 Aug 2007 12:51:10 -0000 1.4 --- ChartForReportTest.java 15 Oct 2007 20:23:24 -0000 1.5 *************** *** 12,15 **** --- 12,16 ---- import java.util.List; + import net.sf.tail.DummyStock; import net.sf.tail.Indicator; import net.sf.tail.OperationType; *************** *** 111,119 **** TimeSeries timeSeries = null; try { ! timeSeries = ctsl.load(new FileInputStream("BaseBovespa/15min/ambv4.csv"), ""); } catch (FileNotFoundException e) { e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); } return timeSeries; --- 112,118 ---- TimeSeries timeSeries = null; try { ! timeSeries = new DummyStock(ctsl.load(new FileInputStream("BaseBovespa/15min/ambv4.csv"), "")); } catch (FileNotFoundException e) { e.printStackTrace(); } return timeSeries; Index: CashFlowDatasetTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/CashFlowDatasetTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CashFlowDatasetTest.java 23 Aug 2007 12:51:10 -0000 1.4 --- CashFlowDatasetTest.java 15 Oct 2007 20:23:24 -0000 1.5 *************** *** 6,9 **** --- 6,10 ---- import java.util.List; + import net.sf.tail.DummyStock; import net.sf.tail.Operation; import net.sf.tail.OperationType; *************** *** 37,41 **** ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 4d)); ! series = new DefaultTimeSeries(ticks); trades = new LinkedList<Trade>(); --- 38,42 ---- ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 4d)); ! series = new DummyStock( new DefaultTimeSeries(ticks)); trades = new LinkedList<Trade>(); *************** *** 80,84 **** public void testMoveRight() { ticks.add(new Tick(new DateTime().withDate(2007, 6, 10), 4d)); ! series = new DefaultTimeSeries(ticks); cashFlow = new CashFlow(series, trades); CashFlowDataset dataset = new CashFlowDataset(series, cashFlow, 0, 3); --- 81,85 ---- public void testMoveRight() { ticks.add(new Tick(new DateTime().withDate(2007, 6, 10), 4d)); ! series = new DummyStock(new DefaultTimeSeries(ticks)); cashFlow = new CashFlow(series, trades); CashFlowDataset dataset = new CashFlowDataset(series, cashFlow, 0, 3); *************** *** 93,97 **** public void testMoveLeft() { ticks.add(new Tick(new DateTime().withDate(2007, 6, 10), 4d)); ! series = new DefaultTimeSeries(ticks); cashFlow = new CashFlow(series, trades); CashFlowDataset dataset = new CashFlowDataset(series, cashFlow, 0, 3); --- 94,98 ---- public void testMoveLeft() { ticks.add(new Tick(new DateTime().withDate(2007, 6, 10), 4d)); ! series = new DummyStock(new DefaultTimeSeries(ticks)); cashFlow = new CashFlow(series, trades); CashFlowDataset dataset = new CashFlowDataset(series, cashFlow, 0, 3); Index: StockAndCashFlowDatasetTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/StockAndCashFlowDatasetTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** StockAndCashFlowDatasetTest.java 23 Aug 2007 12:51:10 -0000 1.2 --- StockAndCashFlowDatasetTest.java 15 Oct 2007 20:23:24 -0000 1.3 *************** *** 6,9 **** --- 6,10 ---- import java.util.List; + import net.sf.tail.DummyStock; import net.sf.tail.Operation; import net.sf.tail.OperationType; *************** *** 40,44 **** ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 4d)); ! series = new DefaultTimeSeries(ticks); trades = new LinkedList<Trade>(); --- 41,45 ---- ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 4d)); ! series = new DummyStock(new DefaultTimeSeries(ticks)); trades = new LinkedList<Trade>(); |