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

[Thies <tg...@us...>]

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

Modified Files:
	WalkForward.java 
Log Message:
Refatoração nos scripts

Index: WalkForward.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/walk/WalkForward.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** WalkForward.java	28 Nov 2007 16:04:43 -0000	1.24
--- WalkForward.java	5 Dec 2007 23:22:46 -0000	1.25
***************
*** 3,10 ****
  import java.util.LinkedList;
  import java.util.List;
- import java.util.Set;
  
  import net.sf.tail.AnalysisCriterion;
! import net.sf.tail.Strategy;
  import net.sf.tail.StrategyEvaluator;
  import net.sf.tail.TimeSeriesSlicer;
--- 3,9 ----
  import java.util.LinkedList;
  import java.util.List;
  
  import net.sf.tail.AnalysisCriterion;
! import net.sf.tail.StrategiesSet;
  import net.sf.tail.StrategyEvaluator;
  import net.sf.tail.TimeSeriesSlicer;
***************
*** 25,28 ****
--- 24,28 ----
  	private StrategyEvaluatorFactory evaluatorFactory;
  	private RunnerFactory runnerFactory;
+ 	
  
  
***************
*** 33,42 ****
  	}
  
! 	public Report walk(Set<Strategy> strategies, TimeSeriesSlicer slicer, AnalysisCriterion criterion) {
  
  		LOG.info("Running strategies");
  		List<Decision> decisions = new LinkedList<Decision>();
  
! 		StrategyEvaluator evaluator = evaluatorFactory.create(runnerFactory, strategies, slicer, criterion);
  		Decision lastDecision = evaluator.evaluate(0);
  
--- 33,42 ----
  	}
  
! 	public Report walk(StrategiesSet strategiesSet, TimeSeriesSlicer slicer, AnalysisCriterion criterion) {
  
  		LOG.info("Running strategies");
  		List<Decision> decisions = new LinkedList<Decision>();
  
! 		StrategyEvaluator evaluator = evaluatorFactory.create(runnerFactory, strategiesSet.getStrategies(), slicer, criterion);
  		Decision lastDecision = evaluator.evaluate(0);
  
***************
*** 53,57 ****
  
  		}
! 		return new Report(strategies, criterion, slicer, decisions);
  	}
  
--- 53,57 ----
  
  		}
! 		return new Report(strategiesSet, criterion, slicer, decisions);
  	}