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

[xanaot <xa...@us...>]

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

Modified Files:
	WalkForward.java 
Log Message:
Refatoração dos Slicer

Index: WalkForward.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/walk/WalkForward.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** WalkForward.java	3 Oct 2007 17:46:59 -0000	1.19
--- WalkForward.java	3 Oct 2007 22:56:47 -0000	1.20
***************
*** 5,13 ****
  import java.util.Set;
  
- import org.apache.log4j.Logger;
- 
  import net.sf.tail.AnalysisCriterion;
  import net.sf.tail.Evaluator;
- import net.sf.tail.SlicerType;
  import net.sf.tail.Strategy;
  import net.sf.tail.TimeSeries;
--- 5,10 ----
***************
*** 16,19 ****
--- 13,19 ----
  import net.sf.tail.analysis.evaluator.Decision;
  import net.sf.tail.report.Report;
+ import net.sf.tail.series.RegularSlicer;
+ 
+ import org.apache.log4j.Logger;
  
  public class WalkForward implements Walker {
***************
*** 31,36 ****
  	public Report walk(Set<Strategy> strategies, TimeSeriesSlicer slicer, AnalysisCriterion criterion) {
  
! 		TimeSeriesSlicer regularSlicer = slicer.applyForType(SlicerType.REGULAR);
! 
  		LOG.info("Running strategies");
  		List<Decision> decisions = new LinkedList<Decision>();
--- 31,36 ----
  	public Report walk(Set<Strategy> strategies, TimeSeriesSlicer slicer, AnalysisCriterion criterion) {
  
! 		TimeSeriesSlicer regularSlicer = new RegularSlicer(slicer.getSeries(), slicer.getPeriod(), slicer.getSlice(0).getTick(slicer.getSlice(0).getBegin()).getDate());
! 		
  		LOG.info("Running strategies");
  		List<Decision> decisions = new LinkedList<Decision>();