|
From: Márcio V. d. S. <mv...@us...> - 2007-11-21 21:55:17
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/io In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7865/src/test/net/sf/tail/io Modified Files: SerializerTest.java Log Message: Mega refatoração, Runner não está mais vendendo no final de cada slice Index: SerializerTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/io/SerializerTest.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** SerializerTest.java 5 Nov 2007 23:16:10 -0000 1.13 --- SerializerTest.java 21 Nov 2007 21:55:20 -0000 1.14 *************** *** 6,10 **** import java.io.IOException; - import net.sf.tail.OperationType; import net.sf.tail.TimeSeriesSlicer; import net.sf.tail.analysis.StockAnalysis; --- 6,9 ---- *************** *** 13,19 **** import net.sf.tail.analysis.criteria.NumberOfTicksCriterion; import net.sf.tail.analysis.criteria.TotalProfitCriterion; ! import net.sf.tail.analysis.evaluator.HigherValueEvaluator; import net.sf.tail.io.reader.CedroTimeSeriesLoader; ! import net.sf.tail.runner.HistoryRunner; import net.sf.tail.series.FullyMemorizedSlicer; import net.sf.tail.series.SerializableTimeSeries; --- 12,18 ---- import net.sf.tail.analysis.criteria.NumberOfTicksCriterion; import net.sf.tail.analysis.criteria.TotalProfitCriterion; ! import net.sf.tail.analysis.evaluator.HigherValueEvaluatorFactory; import net.sf.tail.io.reader.CedroTimeSeriesLoader; ! import net.sf.tail.runner.HistoryRunnerFactory; import net.sf.tail.series.FullyMemorizedSlicer; import net.sf.tail.series.SerializableTimeSeries; *************** *** 29,38 **** private TimeSeriesSlicer slicer; - private HistoryRunner runner; - private SerializableTimeSeries stock; - private HigherValueEvaluator evaluator; - @Before public void setUp() throws Exception { --- 28,33 ---- *************** *** 40,45 **** slicer = new FullyMemorizedSlicer(stock, new Period().withDays(1)); ! runner = new HistoryRunner(OperationType.BUY); ! evaluator = new HigherValueEvaluator(runner); applyedCriterion = new TotalProfitCriterion(); --- 35,40 ---- slicer = new FullyMemorizedSlicer(stock, new Period().withDays(1)); ! // runner = new HistoryRunner(OperationType.BUY); ! // evaluator = new HigherValueEvaluator(runner); applyedCriterion = new TotalProfitCriterion(); *************** *** 59,63 **** public void testStockAnalysisSerializer() throws FileNotFoundException, IOException { ! StockAnalysis stockAnalysis = new StockAnalysis(stock, applyedCriterion, slicer, evaluator); stockAnalysis.addCriterion(new MaximumDrawDownCriterion()); --- 54,58 ---- public void testStockAnalysisSerializer() throws FileNotFoundException, IOException { ! StockAnalysis stockAnalysis = new StockAnalysis(stock, applyedCriterion, slicer,new HigherValueEvaluatorFactory(),new HistoryRunnerFactory()); stockAnalysis.addCriterion(new MaximumDrawDownCriterion()); |