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

[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-serv23296/src/java/net/sf/tail/analysis/walk

Modified Files:
	WalkForward.java 
Log Message:
refatoração de código e conserto de alguns testes

Index: WalkForward.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/walk/WalkForward.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** WalkForward.java	4 Aug 2007 02:34:19 -0000	1.13
--- WalkForward.java	4 Aug 2007 17:07:15 -0000	1.14
***************
*** 6,16 ****
  
  import net.sf.tail.AnalysisCriterion;
- 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;
--- 6,15 ----
  
  import net.sf.tail.AnalysisCriterion;
  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.SplittedTimeSeries;
  import net.sf.tail.analysis.evaluator.Decision;
  
  import org.apache.log4j.Logger;
***************
*** 26,41 ****
  	}
  
! 	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);
  		LOG.info("First best decision calculated: " + lastDecision);
  
! 		for (int i = 1; i < constrainedSeries.size(); i++) {
! 			TimeSeries currentSeries = constrainedSeries.get(i);
  			decisions.add(lastDecision.applyFor(currentSeries));
  			lastDecision = evaluator.evaluate(strategies, currentSeries, criterion);
--- 25,39 ----
  	}
  
! 	public List<Decision> walk(Set<Strategy> strategies, SplittedTimeSeries splittedSeries, AnalysisCriterion criterion)  {
  
  		LOG.info("Running strategies " + strategies);
  		List<Decision> decisions = new LinkedList<Decision>();
  
! 		Decision lastDecision = evaluator.evaluate(strategies, splittedSeries.getSlice(0), criterion);
! 		
  		LOG.info("First best decision calculated: " + lastDecision);
  
! 		for (int i = 1; i < splittedSeries.getSlices(); i++) {
! 			TimeSeries currentSeries = splittedSeries.getSlice(i);
  			decisions.add(lastDecision.applyFor(currentSeries));
  			lastDecision = evaluator.evaluate(strategies, currentSeries, criterion);