[Tail-cvs] Tail/src/java/net/sf/tail/analysis/walk WalkForward.java, 1.13

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

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

Modified Files:
	WalkForward.java 
Log Message:
mega merge erefatoração de código e correção de testes

Index: WalkForward.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/walk/WalkForward.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** WalkForward.java	2 Aug 2007 23:40:25 -0000	1.12
--- WalkForward.java	4 Aug 2007 02:34:19 -0000	1.13
***************
*** 8,16 ****
  import net.sf.tail.ConstrainedTimeSeries;
  import net.sf.tail.Evaluator;
- import net.sf.tail.Splitter;
  import net.sf.tail.Strategy;
  import net.sf.tail.TimeSeries;
  import net.sf.tail.Walker;
  import net.sf.tail.analysis.evaluator.Decision;
  
  import org.apache.log4j.Logger;
--- 8,16 ----
  import net.sf.tail.ConstrainedTimeSeries;
  import net.sf.tail.Evaluator;
  import net.sf.tail.Strategy;
  import net.sf.tail.TimeSeries;
  import net.sf.tail.Walker;
  import net.sf.tail.analysis.evaluator.Decision;
+ import net.sf.tail.analysis.splitter.EnumSplitter;
  
  import org.apache.log4j.Logger;
***************
*** 26,36 ****
  	}
  
! 	public List<Decision> walk(Set<Strategy> strategies, TimeSeries series, int interval, AnalysisCriterion criterion) {
  
  		LOG.info("Running strategies " + strategies);
  		List<Decision> decisions = new LinkedList<Decision>();
  
! 		Splitter splitter = new RegularSplitter();
! 		List<ConstrainedTimeSeries> constrainedSeries = splitter.split(series, interval);
  
  		Decision lastDecision = evaluator.evaluate(strategies, constrainedSeries.get(0), criterion);
--- 26,35 ----
  	}
  
! 	public List<Decision> walk(Set<Strategy> strategies, TimeSeries series,EnumSplitter enumSplitter, AnalysisCriterion criterion)  {
  
  		LOG.info("Running strategies " + strategies);
  		List<Decision> decisions = new LinkedList<Decision>();
  
! 		List<ConstrainedTimeSeries> constrainedSeries = enumSplitter.split(series);
  
  		Decision lastDecision = evaluator.evaluate(strategies, constrainedSeries.get(0), criterion);