Menu
▾
▴
[Tail-cvs] Tail/src/test/net/sf/tail/report ReportTest.java, 1.8 SliceReportGeneratorTest.java, 1.7 ReportGeneratorTest.java, 1.26 CompleteReportGeneratorTest.java, 1.8
|
From: Márcio V. d. S. <mv...@us...> - 2007-11-21 21:55:46
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7865/src/test/net/sf/tail/report Modified Files: ReportTest.java SliceReportGeneratorTest.java ReportGeneratorTest.java CompleteReportGeneratorTest.java Log Message: Mega refatoração, Runner não está mais vendendo no final de cada slice Index: CompleteReportGeneratorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/CompleteReportGeneratorTest.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CompleteReportGeneratorTest.java 15 Oct 2007 20:23:23 -0000 1.7 --- CompleteReportGeneratorTest.java 21 Nov 2007 21:55:19 -0000 1.8 *************** *** 19,22 **** --- 19,23 ---- import net.sf.tail.sample.SampleTimeSeries; import net.sf.tail.series.FullyMemorizedSlicer; + import net.sf.tail.series.RegularSlicer; import net.sf.tail.strategy.FakeStrategy; *************** *** 38,41 **** --- 39,44 ---- public void setUp() throws Exception { SampleTimeSeries series = new SampleTimeSeries(); + slicer = new RegularSlicer(series,new Period().withYears(2000)); + List<Trade> trades = new ArrayList<Trade>(); trades.add(new Trade(new Operation(0, OperationType.BUY), new Operation(2, OperationType.SELL))); *************** *** 43,48 **** 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); slicer = new FullyMemorizedSlicer(series, new Period().withYears(1)); --- 46,54 ---- decisions = new ArrayList<Decision>(); ! ! TimeSeriesSlicer slicer = new RegularSlicer(series,new Period().withYears(2000)); ! ! Decision decision = new Decision(new FakeStrategy(new Operation[0], new Operation[0]), slicer,0, ! new TotalProfitCriterion(), trades, new HistoryRunner(slicer,new FakeStrategy(new Operation[0], new Operation[0]))); decisions.add(decision); slicer = new FullyMemorizedSlicer(series, new Period().withYears(1)); Index: ReportTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/ReportTest.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ReportTest.java 5 Nov 2007 23:16:09 -0000 1.7 --- ReportTest.java 21 Nov 2007 21:55:19 -0000 1.8 *************** *** 10,13 **** --- 10,14 ---- import net.sf.tail.Operation; import net.sf.tail.OperationType; + import net.sf.tail.Strategy; import net.sf.tail.TimeSeriesSlicer; import net.sf.tail.Trade; *************** *** 40,47 **** 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); slicer = new FullyMemorizedSlicer(series, new Period().withYears(1)); } --- 41,50 ---- decisions = new ArrayList<Decision>(); slicer = new FullyMemorizedSlicer(series, new Period().withYears(1)); + 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); + } Index: ReportGeneratorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/ReportGeneratorTest.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** ReportGeneratorTest.java 15 Oct 2007 20:23:23 -0000 1.25 --- ReportGeneratorTest.java 21 Nov 2007 21:55:19 -0000 1.26 *************** *** 40,48 **** trades.add(new Trade(new Operation(3, OperationType.BUY), new Operation(5, OperationType.SELL))); 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); ! slicer = new FullyMemorizedSlicer(series, new Period().withYears(1)); criteria = new ArrayList<AnalysisCriterion>(); --- 40,50 ---- trades.add(new Trade(new Operation(3, OperationType.BUY), new Operation(5, OperationType.SELL))); + slicer = new FullyMemorizedSlicer(series, new Period().withYears(1)); decisions = new ArrayList<Decision>(); ! FakeStrategy strategy = new FakeStrategy(new Operation[0], new Operation[0]); ! Decision decision = new Decision(strategy, slicer, 0, ! new TotalProfitCriterion(), trades, new HistoryRunner(slicer, strategy)); decisions.add(decision); ! criteria = new ArrayList<AnalysisCriterion>(); Index: SliceReportGeneratorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/SliceReportGeneratorTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SliceReportGeneratorTest.java 10 Oct 2007 19:04:09 -0000 1.6 --- SliceReportGeneratorTest.java 21 Nov 2007 21:55:19 -0000 1.7 *************** *** 10,13 **** --- 10,15 ---- import net.sf.tail.Operation; import net.sf.tail.OperationType; + import net.sf.tail.Strategy; + import net.sf.tail.TimeSeriesSlicer; import net.sf.tail.Trade; import net.sf.tail.analysis.criteria.NumberOfTicksCriterion; *************** *** 17,23 **** --- 19,27 ---- import net.sf.tail.runner.HistoryRunner; import net.sf.tail.sample.SampleTimeSeries; + import net.sf.tail.series.RegularSlicer; import net.sf.tail.strategy.FakeStrategy; import org.joda.time.DateTime; + import org.joda.time.Period; import org.junit.Before; import org.junit.Test; *************** *** 38,43 **** trades.add(new Trade(new Operation(3, OperationType.BUY), new Operation(5, OperationType.SELL))); ! decision = new Decision(new FakeStrategy(new Operation[0], new Operation[0]), series, ! new TotalProfitCriterion(), trades, new HistoryRunner(OperationType.BUY)); criteria = new ArrayList<AnalysisCriterion>(); --- 42,49 ---- trades.add(new Trade(new Operation(3, OperationType.BUY), new Operation(5, OperationType.SELL))); ! TimeSeriesSlicer slicer = new RegularSlicer(series, new Period().withYears(2000)); ! Strategy strategy = new FakeStrategy(new Operation[0], new Operation[0]); ! decision = new Decision(strategy, slicer, 0, ! new TotalProfitCriterion(), trades, new HistoryRunner(slicer, strategy)); criteria = new ArrayList<AnalysisCriterion>(); |
