[Tail-cvs] Tail/src/java/net/sf/tail/analysis StockAnalysis.java, 1.16

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

Update of /cvsroot/tail/Tail/src/java/net/sf/tail/analysis
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7865/src/java/net/sf/tail/analysis

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

Index: StockAnalysis.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/StockAnalysis.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** StockAnalysis.java	5 Nov 2007 23:16:10 -0000	1.15
--- StockAnalysis.java	21 Nov 2007 21:55:21 -0000	1.16
***************
*** 15,23 ****
  import net.sf.tail.AnalysisCriterion;
  import net.sf.tail.Strategy;
- import net.sf.tail.StrategyEvaluator;
  import net.sf.tail.TimeSeriesSlicer;
  import net.sf.tail.analysis.walk.WalkForward;
  import net.sf.tail.dsl.ruby.RubyDSL;
  import net.sf.tail.report.Report;
  import net.sf.tail.series.SerializableTimeSeries;
  
--- 15,24 ----
  import net.sf.tail.AnalysisCriterion;
  import net.sf.tail.Strategy;
  import net.sf.tail.TimeSeriesSlicer;
+ import net.sf.tail.analysis.evaluator.StrategyEvaluatorFactory;
  import net.sf.tail.analysis.walk.WalkForward;
  import net.sf.tail.dsl.ruby.RubyDSL;
  import net.sf.tail.report.Report;
+ import net.sf.tail.runner.RunnerFactory;
  import net.sf.tail.series.SerializableTimeSeries;
  
***************
*** 40,45 ****
  	private SerializableTimeSeries stock;
  
- 	private StrategyEvaluator evaluator;
- 
  	private List<Report> reports;
  
--- 41,44 ----
***************
*** 48,58 ****
  	private transient RubyDSL dsl;
  
! 	public StockAnalysis(SerializableTimeSeries stock, AnalysisCriterion applyedCriterion, TimeSeriesSlicer slicer, StrategyEvaluator evaluator) {
  		this.stock = stock;
  		this.applyedCriterion = applyedCriterion;
  		this.slicer = slicer;
! 		this.evaluator = evaluator;
  
! 		walker = new WalkForward(evaluator);
  		reports = new ArrayList<Report>();
  		additionalCriteria = new ArrayList<AnalysisCriterion>();
--- 47,62 ----
  	private transient RubyDSL dsl;
  
! 	private StrategyEvaluatorFactory evaluatorFactory;
! 
! 	private RunnerFactory runnerFactory;
! 
! 	public StockAnalysis(SerializableTimeSeries stock, AnalysisCriterion applyedCriterion, TimeSeriesSlicer slicer, StrategyEvaluatorFactory evaluatorFactory, RunnerFactory runnerFactory) {
  		this.stock = stock;
  		this.applyedCriterion = applyedCriterion;
  		this.slicer = slicer;
! 		this.evaluatorFactory = evaluatorFactory;
! 		this.runnerFactory = runnerFactory;
  
! 		walker = new WalkForward(evaluatorFactory,runnerFactory);
  		reports = new ArrayList<Report>();
  		additionalCriteria = new ArrayList<AnalysisCriterion>();
***************
*** 138,143 ****
  	}
  
! 	public StrategyEvaluator getEvaluator() {
! 		return evaluator;
  	}
  
--- 142,147 ----
  	}
  
! 	public StrategyEvaluatorFactory getEvaluatorFactory() {
! 		return evaluatorFactory;
  	}
  
***************
*** 169,173 ****
  		int result = 1;
  		result = prime * result + ((applyedCriterion == null) ? 0 : applyedCriterion.hashCode());
! 		result = prime * result + ((evaluator == null) ? 0 : evaluator.hashCode());
  		result = prime * result + (reports.hashCode());
  		result = prime * result + ((slicer == null) ? 0 : slicer.hashCode());
--- 173,177 ----
  		int result = 1;
  		result = prime * result + ((applyedCriterion == null) ? 0 : applyedCriterion.hashCode());
! 		result = prime * result + ((evaluatorFactory == null) ? 0 : evaluatorFactory.hashCode());
  		result = prime * result + (reports.hashCode());
  		result = prime * result + ((slicer == null) ? 0 : slicer.hashCode());
***************
*** 190,197 ****
  		} else if (!applyedCriterion.equals(other.applyedCriterion))
  			return false;
! 		if (evaluator == null) {
! 			if (other.evaluator != null)
  				return false;
! 		} else if (!evaluator.equals(other.evaluator))
  			return false;
  		if (!reports.equals(other.reports))
--- 194,201 ----
  		} else if (!applyedCriterion.equals(other.applyedCriterion))
  			return false;
! 		if (evaluatorFactory == null) {
! 			if (other.evaluatorFactory != null)
  				return false;
! 		} else if (!evaluatorFactory.equals(other.evaluatorFactory))
  			return false;
  		if (!reports.equals(other.reports))
***************
*** 223,226 ****
--- 227,234 ----
  		
  		return text;
+ 	}
+ 
+ 	public RunnerFactory getRunnerFactory() {
+ 		return runnerFactory;
  	}