tail-cvs

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/TailS/src/test/net/sf/tails/swing/helper
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7762/src/test/net/sf/tails/swing/helper

Modified Files:
	CompleteXLSGeneratorTest.java ReportImageTest.java 
	CompleteHtmlGeneratorExecutor.java 
	CompleteHtmlGeneratorTest.java 
	CompleteXlsGeneratorExecutor.java 
Log Message:
Mega refatoração, Runner não está mais vendendo no final de cada slice

Index: ReportImageTest.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/test/net/sf/tails/swing/helper/ReportImageTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ReportImageTest.java	15 Oct 2007 20:23:57 -0000	1.3
--- ReportImageTest.java	21 Nov 2007 21:55:11 -0000	1.4
***************
*** 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;
***************
*** 46,53 ****
  
  		ArrayList<Decision> decisions = new ArrayList<Decision>();
- 		decision = new Decision(new FakeStrategy(new Operation[0], new Operation[0]), series,
- 				new TotalProfitCriterion(), trades, new HistoryRunner(OperationType.BUY));
- 		decisions.add(decision);
  		TimeSeriesSlicer slicer = new FullyMemorizedSlicer(series, period);
  
  		report = new Report(null,new TotalProfitCriterion(), slicer, decisions);
--- 47,56 ----
  
  		ArrayList<Decision> decisions = new ArrayList<Decision>();
  		TimeSeriesSlicer slicer = new FullyMemorizedSlicer(series, period);
+ 		Strategy strategy = new FakeStrategy(new Operation[0], new Operation[0]);
+ 		decision = new Decision(strategy, slicer, 0,
+ 				new TotalProfitCriterion(), trades, new HistoryRunner(slicer, strategy));
+ 		decisions.add(decision);
+ 		
  
  		report = new Report(null,new TotalProfitCriterion(), slicer, decisions);

Index: CompleteXlsGeneratorExecutor.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/test/net/sf/tails/swing/helper/CompleteXlsGeneratorExecutor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CompleteXlsGeneratorExecutor.java	17 Oct 2007 16:42:10 -0000	1.4
--- CompleteXlsGeneratorExecutor.java	21 Nov 2007 21:55:11 -0000	1.5
***************
*** 12,16 ****
  import net.sf.tail.AnalysisCriterion;
  import net.sf.tail.Indicator;
- import net.sf.tail.OperationType;
  import net.sf.tail.Strategy;
  import net.sf.tail.TimeSeries;
--- 12,15 ----
***************
*** 23,27 ****
  import net.sf.tail.analysis.criteria.TotalProfitCriterion;
  import net.sf.tail.analysis.criteria.VersusBuyAndHoldCriterion;
! import net.sf.tail.analysis.evaluator.HigherValueEvaluator;
  import net.sf.tail.analysis.walk.WalkForward;
  import net.sf.tail.indicator.simple.ClosePriceIndicator;
--- 22,26 ----
  import net.sf.tail.analysis.criteria.TotalProfitCriterion;
  import net.sf.tail.analysis.criteria.VersusBuyAndHoldCriterion;
! import net.sf.tail.analysis.evaluator.HigherValueEvaluatorFactory;
  import net.sf.tail.analysis.walk.WalkForward;
  import net.sf.tail.indicator.simple.ClosePriceIndicator;
***************
*** 29,33 ****
  import net.sf.tail.io.reader.CedroTimeSeriesLoader;
  import net.sf.tail.report.Report;
! import net.sf.tail.runner.HistoryRunner;
  import net.sf.tail.series.FullyMemorizedSlicer;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
--- 28,32 ----
  import net.sf.tail.io.reader.CedroTimeSeriesLoader;
  import net.sf.tail.report.Report;
! import net.sf.tail.runner.HistoryRunnerFactory;
  import net.sf.tail.series.FullyMemorizedSlicer;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
***************
*** 49,53 ****
  		}
  
! 		Walker w = new WalkForward(new HigherValueEvaluator(new HistoryRunner(OperationType.BUY)));
  		Indicator<Double> close = new ClosePriceIndicator(timeSeries);
  
--- 48,52 ----
  		}
  
! 		Walker w = new WalkForward(new HigherValueEvaluatorFactory(), new HistoryRunnerFactory());
  		Indicator<Double> close = new ClosePriceIndicator(timeSeries);
  

Index: CompleteHtmlGeneratorExecutor.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/test/net/sf/tails/swing/helper/CompleteHtmlGeneratorExecutor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CompleteHtmlGeneratorExecutor.java	17 Oct 2007 18:36:58 -0000	1.6
--- CompleteHtmlGeneratorExecutor.java	21 Nov 2007 21:55:11 -0000	1.7
***************
*** 11,15 ****
  import net.sf.tail.AnalysisCriterion;
  import net.sf.tail.Indicator;
- import net.sf.tail.OperationType;
  import net.sf.tail.Strategy;
  import net.sf.tail.TimeSeries;
--- 11,14 ----
***************
*** 21,25 ****
  import net.sf.tail.analysis.criteria.TotalProfitCriterion;
  import net.sf.tail.analysis.criteria.VersusBuyAndHoldCriterion;
! import net.sf.tail.analysis.evaluator.HigherValueEvaluator;
  import net.sf.tail.analysis.walk.WalkForward;
  import net.sf.tail.indicator.simple.ClosePriceIndicator;
--- 20,24 ----
  import net.sf.tail.analysis.criteria.TotalProfitCriterion;
  import net.sf.tail.analysis.criteria.VersusBuyAndHoldCriterion;
! import net.sf.tail.analysis.evaluator.HigherValueEvaluatorFactory;
  import net.sf.tail.analysis.walk.WalkForward;
  import net.sf.tail.indicator.simple.ClosePriceIndicator;
***************
*** 27,31 ****
  import net.sf.tail.io.reader.CedroTimeSeriesLoader;
  import net.sf.tail.report.Report;
! import net.sf.tail.runner.HistoryRunner;
  import net.sf.tail.series.FullyMemorizedSlicer;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
--- 26,30 ----
  import net.sf.tail.io.reader.CedroTimeSeriesLoader;
  import net.sf.tail.report.Report;
! import net.sf.tail.runner.HistoryRunnerFactory;
  import net.sf.tail.series.FullyMemorizedSlicer;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
***************
*** 48,52 ****
  		}
  
! 		Walker w = new WalkForward(new HigherValueEvaluator(new HistoryRunner(OperationType.BUY)));
  		Indicator<Double> close = new ClosePriceIndicator(timeSeries);
  
--- 47,51 ----
  		}
  
! 		Walker w = new WalkForward(new HigherValueEvaluatorFactory(), new HistoryRunnerFactory());
  		Indicator<Double> close = new ClosePriceIndicator(timeSeries);
  

Index: CompleteXLSGeneratorTest.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/test/net/sf/tails/swing/helper/CompleteXLSGeneratorTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CompleteXLSGeneratorTest.java	15 Oct 2007 20:23:57 -0000	1.3
--- CompleteXLSGeneratorTest.java	21 Nov 2007 21:55:11 -0000	1.4
***************
*** 11,14 ****
--- 11,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;
***************
*** 49,56 ****
  
  		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);
  		TimeSeriesSlicer slicer = new FullyMemorizedSlicer(series, period);
  
  		report = new Report(null,new TotalProfitCriterion(), slicer, decisions);
--- 50,59 ----
  
  		ArrayList<Decision> decisions = new ArrayList<Decision>();
  		TimeSeriesSlicer slicer = new FullyMemorizedSlicer(series, period);
+ 		Strategy 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);
+ 		
  
  		report = new Report(null,new TotalProfitCriterion(), slicer, decisions);

Index: CompleteHtmlGeneratorTest.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/test/net/sf/tails/swing/helper/CompleteHtmlGeneratorTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CompleteHtmlGeneratorTest.java	15 Oct 2007 20:23:57 -0000	1.4
--- CompleteHtmlGeneratorTest.java	21 Nov 2007 21:55:11 -0000	1.5
***************
*** 9,12 ****
--- 9,13 ----
  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;
***************
*** 49,58 ****
  		period = new Period().withYears(1);
  		trades.add(new Trade(new Operation(0, OperationType.BUY), new Operation(2, 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);
! 		TimeSeriesSlicer slicer = new FullyMemorizedSlicer(series, period);
  
  		report = new Report(null, new TotalProfitCriterion(), slicer, decisions);
--- 50,59 ----
  		period = new Period().withYears(1);
  		trades.add(new Trade(new Operation(0, OperationType.BUY), new Operation(2, OperationType.SELL)));
! 		TimeSeriesSlicer slicer = new FullyMemorizedSlicer(series, period);
  		ArrayList<Decision> decisions = new ArrayList<Decision>();
! 		Strategy 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);
! 		
  
  		report = new Report(null, new TotalProfitCriterion(), slicer, decisions);