Menu
▾
▴
[Tail-cvs] Tail/src/test/net/sf/tail/graphics ChartForReportTest.java, 1.9 CriteriaDatasetTest.java, 1.7 ChartTest.java, 1.11 StockAndCashFlowChartTest.java, 1.8 FasterCriteriaDatasetTest.java, 1.3 CombinedSeriesAndFlowChartTest.java, 1.8
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/graphics In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7865/src/test/net/sf/tail/graphics Modified Files: ChartForReportTest.java CriteriaDatasetTest.java ChartTest.java StockAndCashFlowChartTest.java FasterCriteriaDatasetTest.java CombinedSeriesAndFlowChartTest.java Log Message: Mega refatoração, Runner não está mais vendendo no final de cada slice Index: FasterCriteriaDatasetTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/FasterCriteriaDatasetTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FasterCriteriaDatasetTest.java 7 Nov 2007 23:40:48 -0000 1.2 --- FasterCriteriaDatasetTest.java 21 Nov 2007 21:55:20 -0000 1.3 *************** *** 9,20 **** import net.sf.tail.AnalysisCriterion; - import net.sf.tail.OperationType; import net.sf.tail.Strategy; import net.sf.tail.TimeSeriesSlicer; import net.sf.tail.analysis.criteria.TotalProfitCriterion; ! import net.sf.tail.analysis.evaluator.HigherValueEvaluator; import net.sf.tail.analysis.walk.WalkForward; import net.sf.tail.report.Report; ! import net.sf.tail.runner.HistoryRunner; import net.sf.tail.sample.SampleIndicator; import net.sf.tail.sample.SampleTimeSeries; --- 9,19 ---- import net.sf.tail.AnalysisCriterion; import net.sf.tail.Strategy; import net.sf.tail.TimeSeriesSlicer; import net.sf.tail.analysis.criteria.TotalProfitCriterion; ! import net.sf.tail.analysis.evaluator.HigherValueEvaluatorFactory; import net.sf.tail.analysis.walk.WalkForward; import net.sf.tail.report.Report; ! import net.sf.tail.runner.HistoryRunnerFactory; import net.sf.tail.sample.SampleIndicator; import net.sf.tail.sample.SampleTimeSeries; *************** *** 62,66 **** strategies2.add(new IndicatorOverIndicatorStrategy(indicator2, indicator1)); ! WalkForward walk = new WalkForward(new HigherValueEvaluator(new HistoryRunner(OperationType.BUY))); TimeSeriesSlicer slice = new RegularSlicer(series, new Period().withDays(2)); AnalysisCriterion criterion = new TotalProfitCriterion(); --- 61,65 ---- strategies2.add(new IndicatorOverIndicatorStrategy(indicator2, indicator1)); ! WalkForward walk = new WalkForward(new HigherValueEvaluatorFactory(),new HistoryRunnerFactory()); TimeSeriesSlicer slice = new RegularSlicer(series, new Period().withDays(2)); AnalysisCriterion criterion = new TotalProfitCriterion(); *************** *** 108,112 **** strategies2.add(new IndicatorOverIndicatorStrategy(indicator2, indicator1)); ! WalkForward walk = new WalkForward(new HigherValueEvaluator(new HistoryRunner(OperationType.BUY))); TimeSeriesSlicer slice = new RegularSlicer(series, new Period().withDays(2)); AnalysisCriterion criterion = new TotalProfitCriterion(); --- 107,111 ---- strategies2.add(new IndicatorOverIndicatorStrategy(indicator2, indicator1)); ! WalkForward walk = new WalkForward(new HigherValueEvaluatorFactory(),new HistoryRunnerFactory()); TimeSeriesSlicer slice = new RegularSlicer(series, new Period().withDays(2)); AnalysisCriterion criterion = new TotalProfitCriterion(); *************** *** 154,158 **** strategies2.add(new IndicatorOverIndicatorStrategy(indicator2, indicator1)); ! WalkForward walk = new WalkForward(new HigherValueEvaluator(new HistoryRunner(OperationType.BUY))); TimeSeriesSlicer slice = new RegularSlicer(series, new Period().withDays(2)); AnalysisCriterion criterion = new TotalProfitCriterion(); --- 153,157 ---- strategies2.add(new IndicatorOverIndicatorStrategy(indicator2, indicator1)); ! WalkForward walk = new WalkForward(new HigherValueEvaluatorFactory(),new HistoryRunnerFactory()); TimeSeriesSlicer slice = new RegularSlicer(series, new Period().withDays(2)); AnalysisCriterion criterion = new TotalProfitCriterion(); *************** *** 199,203 **** strategies2.add(new IndicatorOverIndicatorStrategy(indicator2, indicator1)); ! WalkForward walk = new WalkForward(new HigherValueEvaluator(new HistoryRunner(OperationType.BUY))); TimeSeriesSlicer slice = new RegularSlicer(series, new Period().withDays(2)); AnalysisCriterion criterion = new TotalProfitCriterion(); --- 198,202 ---- strategies2.add(new IndicatorOverIndicatorStrategy(indicator2, indicator1)); ! WalkForward walk = new WalkForward(new HigherValueEvaluatorFactory(),new HistoryRunnerFactory()); TimeSeriesSlicer slice = new RegularSlicer(series, new Period().withDays(2)); AnalysisCriterion criterion = new TotalProfitCriterion(); Index: CombinedSeriesAndFlowChartTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/CombinedSeriesAndFlowChartTest.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CombinedSeriesAndFlowChartTest.java 22 Oct 2007 22:22:32 -0000 1.7 --- CombinedSeriesAndFlowChartTest.java 21 Nov 2007 21:55:20 -0000 1.8 *************** *** 14,19 **** import net.sf.tail.Indicator; - import net.sf.tail.OperationType; import net.sf.tail.TimeSeries; import net.sf.tail.Trade; import net.sf.tail.flow.CashFlow; --- 14,19 ---- import net.sf.tail.Indicator; import net.sf.tail.TimeSeries; + import net.sf.tail.TimeSeriesSlicer; import net.sf.tail.Trade; import net.sf.tail.flow.CashFlow; *************** *** 22,25 **** --- 22,26 ---- import net.sf.tail.io.reader.CedroTimeSeriesLoader; import net.sf.tail.runner.HistoryRunner; + import net.sf.tail.series.RegularSlicer; import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy; *************** *** 28,31 **** --- 29,33 ---- import org.jfree.ui.ApplicationFrame; import org.jfree.ui.RefineryUtilities; + import org.joda.time.Period; public class CombinedSeriesAndFlowChartTest extends ApplicationFrame implements ActionListener { *************** *** 86,91 **** indicators.add(sma); ! List<Trade> trades = new HistoryRunner(OperationType.BUY).run( ! new IndicatorCrossedIndicatorStrategy(close, sma), 0, 100); cashFlow = new CashFlow(timeSeries, trades); --- 88,94 ---- indicators.add(sma); ! TimeSeriesSlicer slicer = new RegularSlicer(timeSeries,new Period().withYears(2000)); ! ! List<Trade> trades = new HistoryRunner(slicer,new IndicatorCrossedIndicatorStrategy(close, sma)).run(0); cashFlow = new CashFlow(timeSeries, trades); Index: StockAndCashFlowChartTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/StockAndCashFlowChartTest.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** StockAndCashFlowChartTest.java 17 Oct 2007 16:41:53 -0000 1.7 --- StockAndCashFlowChartTest.java 21 Nov 2007 21:55:20 -0000 1.8 *************** *** 10,15 **** import net.sf.tail.Indicator; - import net.sf.tail.OperationType; import net.sf.tail.TimeSeries; import net.sf.tail.Trade; import net.sf.tail.flow.CashFlow; --- 10,15 ---- import net.sf.tail.Indicator; import net.sf.tail.TimeSeries; + import net.sf.tail.TimeSeriesSlicer; import net.sf.tail.Trade; import net.sf.tail.flow.CashFlow; *************** *** 18,21 **** --- 18,22 ---- import net.sf.tail.io.reader.CedroTimeSeriesLoader; import net.sf.tail.runner.HistoryRunner; + import net.sf.tail.series.RegularSlicer; import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy; *************** *** 65,70 **** SMAIndicator sma = new SMAIndicator(indicator, 8); ! List<Trade> trades = new HistoryRunner(OperationType.BUY).run(new IndicatorCrossedIndicatorStrategy(indicator, ! sma), timeSeries.getBegin(), timeSeries.getEnd()); cashFlow = new CashFlow(timeSeries, trades); --- 66,73 ---- SMAIndicator sma = new SMAIndicator(indicator, 8); ! TimeSeriesSlicer slicer = new RegularSlicer(timeSeries,new Period().withYears(2000)); ! ! List<Trade> trades = new HistoryRunner(slicer,new IndicatorCrossedIndicatorStrategy(indicator, ! sma)).run(0); cashFlow = new CashFlow(timeSeries, trades); Index: CriteriaDatasetTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/CriteriaDatasetTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CriteriaDatasetTest.java 7 Nov 2007 23:40:48 -0000 1.6 --- CriteriaDatasetTest.java 21 Nov 2007 21:55:20 -0000 1.7 *************** *** 9,21 **** import net.sf.tail.AnalysisCriterion; - import net.sf.tail.OperationType; import net.sf.tail.Strategy; import net.sf.tail.TimeSeries; import net.sf.tail.TimeSeriesSlicer; import net.sf.tail.analysis.criteria.TotalProfitCriterion; ! import net.sf.tail.analysis.evaluator.HigherValueEvaluator; import net.sf.tail.analysis.walk.WalkForward; import net.sf.tail.report.Report; ! import net.sf.tail.runner.HistoryRunner; import net.sf.tail.sample.SampleIndicator; import net.sf.tail.series.DefaultTimeSeries; --- 9,20 ---- import net.sf.tail.AnalysisCriterion; import net.sf.tail.Strategy; import net.sf.tail.TimeSeries; import net.sf.tail.TimeSeriesSlicer; import net.sf.tail.analysis.criteria.TotalProfitCriterion; ! import net.sf.tail.analysis.evaluator.HigherValueEvaluatorFactory; import net.sf.tail.analysis.walk.WalkForward; import net.sf.tail.report.Report; ! import net.sf.tail.runner.HistoryRunnerFactory; import net.sf.tail.sample.SampleIndicator; import net.sf.tail.series.DefaultTimeSeries; *************** *** 75,79 **** ! WalkForward walk = new WalkForward(new HigherValueEvaluator(new HistoryRunner(OperationType.BUY))); TimeSeriesSlicer slice = new RegularSlicer(series, new Period().withDays(2)); AnalysisCriterion criterion = new TotalProfitCriterion(); --- 74,78 ---- ! WalkForward walk = new WalkForward(new HigherValueEvaluatorFactory(),new HistoryRunnerFactory()); TimeSeriesSlicer slice = new RegularSlicer(series, new Period().withDays(2)); AnalysisCriterion criterion = new TotalProfitCriterion(); Index: ChartTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/ChartTest.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ChartTest.java 24 Oct 2007 22:57:14 -0000 1.10 --- ChartTest.java 21 Nov 2007 21:55:20 -0000 1.11 *************** *** 14,19 **** import net.sf.tail.Indicator; - import net.sf.tail.OperationType; import net.sf.tail.TimeSeries; import net.sf.tail.Trade; import net.sf.tail.indicator.helper.StandardDeviationIndicator; --- 14,19 ---- import net.sf.tail.Indicator; import net.sf.tail.TimeSeries; + import net.sf.tail.TimeSeriesSlicer; import net.sf.tail.Trade; import net.sf.tail.indicator.helper.StandardDeviationIndicator; *************** *** 25,28 **** --- 25,29 ---- import net.sf.tail.io.reader.CedroTimeSeriesLoader; import net.sf.tail.runner.HistoryRunner; + import net.sf.tail.series.RegularSlicer; import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy; *************** *** 31,34 **** --- 32,36 ---- import org.jfree.ui.ApplicationFrame; import org.jfree.ui.RefineryUtilities; + import org.joda.time.Period; public class ChartTest extends ApplicationFrame implements ActionListener { *************** *** 107,112 **** indicators.add(sma); ! List<Trade> trades = new HistoryRunner(OperationType.BUY).run( ! new IndicatorCrossedIndicatorStrategy(close, sma), 0, 100); seriesDataset = new SeriesDataset(timeSeries, indicators, 0, seriesEndIndex, trades); --- 109,115 ---- indicators.add(sma); ! TimeSeriesSlicer slicer = new RegularSlicer(timeSeries,new Period().withYears(2000)); ! ! List<Trade> trades = new HistoryRunner(slicer,new IndicatorCrossedIndicatorStrategy(close, sma)).run(0); seriesDataset = new SeriesDataset(timeSeries, indicators, 0, seriesEndIndex, trades); Index: ChartForReportTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/ChartForReportTest.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ChartForReportTest.java 24 Oct 2007 22:57:14 -0000 1.8 --- ChartForReportTest.java 21 Nov 2007 21:55:20 -0000 1.9 *************** *** 13,18 **** import net.sf.tail.Indicator; - import net.sf.tail.OperationType; import net.sf.tail.TimeSeries; import net.sf.tail.Trade; import net.sf.tail.indicator.simple.ClosePriceIndicator; --- 13,18 ---- import net.sf.tail.Indicator; import net.sf.tail.TimeSeries; + import net.sf.tail.TimeSeriesSlicer; import net.sf.tail.Trade; import net.sf.tail.indicator.simple.ClosePriceIndicator; *************** *** 20,23 **** --- 20,24 ---- import net.sf.tail.io.reader.CedroTimeSeriesLoader; import net.sf.tail.runner.HistoryRunner; + import net.sf.tail.series.RegularSlicer; import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy; *************** *** 25,28 **** --- 26,30 ---- import org.jfree.chart.JFreeChart; import org.jfree.ui.ApplicationFrame; + import org.joda.time.Period; public class ChartForReportTest extends ApplicationFrame { *************** *** 76,81 **** indicators.add(sma); ! List<Trade> trades = new HistoryRunner(OperationType.BUY).run( ! new IndicatorCrossedIndicatorStrategy(close, sma), timeSeries.getBegin(), timeSeries.getEnd()); // for (int i = timeSeries.getBegin(); i < timeSeries.getEnd(); i = i + --- 78,84 ---- indicators.add(sma); ! TimeSeriesSlicer slicer = new RegularSlicer(timeSeries,new Period().withYears(2000)); ! ! List<Trade> trades = new HistoryRunner(slicer,new IndicatorCrossedIndicatorStrategy(close, sma)).run(0); // for (int i = timeSeries.getBegin(); i < timeSeries.getEnd(); i = i + |