Menu
▾
▴
[Tail-cvs] Tail/src/test/net/sf/tail/report/xls WorkbookGeneratorTest.java, 1.4 SliceXlsGeneratorTest.java, 1.5 ReportXlsGeneratorTest.java, 1.5 TImeSeriesXlsGeneratorTest.java, 1.3
|
From: Márcio V. d. S. <mv...@us...> - 2007-11-21 21:55:17
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/report/xls In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7865/src/test/net/sf/tail/report/xls Modified Files: WorkbookGeneratorTest.java SliceXlsGeneratorTest.java ReportXlsGeneratorTest.java TImeSeriesXlsGeneratorTest.java Log Message: Mega refatoração, Runner não está mais vendendo no final de cada slice Index: WorkbookGeneratorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/xls/WorkbookGeneratorTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** WorkbookGeneratorTest.java 24 Oct 2007 22:57:13 -0000 1.3 --- WorkbookGeneratorTest.java 21 Nov 2007 21:55:20 -0000 1.4 *************** *** 58,67 **** trades.add(new Trade(new Operation(3, OperationType.BUY), new Operation(5, OperationType.SELL))); - ArrayList<Decision> decisions = new ArrayList<Decision>(); - Decision decision = new Decision(new FakeStrategy(new Operation[0], new Operation[0]), series, - new TotalProfitCriterion(), trades, new HistoryRunner(OperationType.BUY)); - decisions.add(decision); period = new Period().withYears(1); FullyMemorizedSlicer slicer = new FullyMemorizedSlicer(series, period); Set<Strategy> strategies = new HashSet<Strategy>(); --- 58,69 ---- trades.add(new Trade(new Operation(3, OperationType.BUY), new Operation(5, OperationType.SELL))); period = new Period().withYears(1); FullyMemorizedSlicer slicer = new FullyMemorizedSlicer(series, period); + ArrayList<Decision> decisions = new ArrayList<Decision>(); + Strategy fakeStrategy = new FakeStrategy(new Operation[0], new Operation[0]); + Decision decision = new Decision(fakeStrategy, slicer, 0, + new TotalProfitCriterion(), trades, new HistoryRunner(slicer, fakeStrategy)); + decisions.add(decision); + Set<Strategy> strategies = new HashSet<Strategy>(); Index: SliceXlsGeneratorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/xls/SliceXlsGeneratorTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SliceXlsGeneratorTest.java 7 Nov 2007 21:40:01 -0000 1.4 --- SliceXlsGeneratorTest.java 21 Nov 2007 21:55:20 -0000 1.5 *************** *** 60,69 **** ArrayList<Decision> decisions = new ArrayList<Decision>(); - Decision decision = new Decision(new FakeStrategy(new Operation[0], new Operation[0]), series, - new TotalProfitCriterion(), trades, new HistoryRunner(OperationType.BUY)); - decisions.add(decision); - period = new Period().withYears(1); FullyMemorizedSlicer slicer = new FullyMemorizedSlicer(series, period); Set<Strategy> strategies = new HashSet<Strategy>(); --- 60,71 ---- ArrayList<Decision> decisions = new ArrayList<Decision>(); period = new Period().withYears(1); FullyMemorizedSlicer slicer = new FullyMemorizedSlicer(series, period); + Strategy fakeStrategy = new FakeStrategy(new Operation[0], new Operation[0]); + Decision decision = new Decision(fakeStrategy, slicer, 0, + new TotalProfitCriterion(), trades, new HistoryRunner(slicer, fakeStrategy)); + decisions.add(decision); + + Set<Strategy> strategies = new HashSet<Strategy>(); Index: ReportXlsGeneratorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/xls/ReportXlsGeneratorTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ReportXlsGeneratorTest.java 7 Nov 2007 21:40:01 -0000 1.4 --- ReportXlsGeneratorTest.java 21 Nov 2007 21:55:20 -0000 1.5 *************** *** 59,68 **** trades.add(new Trade(new Operation(3, OperationType.BUY), new Operation(5, OperationType.SELL))); - ArrayList<Decision> decisions = new ArrayList<Decision>(); - Decision decision = new Decision(new FakeStrategy(new Operation[0], new Operation[0]), series, - new TotalProfitCriterion(), trades, new HistoryRunner(OperationType.BUY)); - decisions.add(decision); period = new Period().withYears(1); FullyMemorizedSlicer slicer = new FullyMemorizedSlicer(series, period); Set<Strategy> strategies = new HashSet<Strategy>(); --- 59,70 ---- trades.add(new Trade(new Operation(3, OperationType.BUY), new Operation(5, OperationType.SELL))); period = new Period().withYears(1); + ArrayList<Decision> decisions = new ArrayList<Decision>(); FullyMemorizedSlicer slicer = new FullyMemorizedSlicer(series, period); + Strategy fakeStrategy = new FakeStrategy(new Operation[0], new Operation[0]); + Decision decision = new Decision(fakeStrategy, slicer, 0, + new TotalProfitCriterion(), trades, new HistoryRunner(slicer, fakeStrategy)); + decisions.add(decision); + Set<Strategy> strategies = new HashSet<Strategy>(); Index: TImeSeriesXlsGeneratorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/xls/TImeSeriesXlsGeneratorTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TImeSeriesXlsGeneratorTest.java 7 Nov 2007 21:40:01 -0000 1.2 --- TImeSeriesXlsGeneratorTest.java 21 Nov 2007 21:55:20 -0000 1.3 *************** *** 1,4 **** --- 1,6 ---- package net.sf.tail.report.xls; + import static org.junit.Assert.assertEquals; + import java.io.IOException; import java.util.ArrayList; *************** *** 27,31 **** import org.junit.Before; import org.junit.Test; - import static org.junit.Assert.*; public class TImeSeriesXlsGeneratorTest { --- 29,32 ---- *************** *** 47,55 **** trades.add(new Trade(new Operation(3, OperationType.BUY), new Operation(5, OperationType.SELL))); ArrayList<Decision> decisions = new ArrayList<Decision>(); ! Decision decision = new Decision(new FakeStrategy(new Operation[0], new Operation[0]), series, ! new TotalProfitCriterion(), trades, new HistoryRunner(OperationType.BUY)); decisions.add(decision); - FullyMemorizedSlicer slicer = new FullyMemorizedSlicer(series, new Period().withYears(1)); Set<Strategy> strategies = new HashSet<Strategy>(); --- 48,57 ---- trades.add(new Trade(new Operation(3, OperationType.BUY), new Operation(5, OperationType.SELL))); + FullyMemorizedSlicer slicer = new FullyMemorizedSlicer(series, new Period().withYears(1)); ArrayList<Decision> decisions = new ArrayList<Decision>(); ! Strategy fakeStrategy = new FakeStrategy(new Operation[0], new Operation[0]); ! Decision decision = new Decision(fakeStrategy, slicer, 0, ! new TotalProfitCriterion(), trades, new HistoryRunner(slicer, fakeStrategy)); decisions.add(decision); Set<Strategy> strategies = new HashSet<Strategy>(); |
