tail-cvs

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

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

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

Index: StockAnalysisTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/StockAnalysisTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** StockAnalysisTest.java	3 Oct 2007 18:58:32 -0000	1.5
--- StockAnalysisTest.java	3 Oct 2007 22:56:47 -0000	1.6
***************
*** 11,15 ****
  import net.sf.tail.OperationType;
  import net.sf.tail.Runner;
- import net.sf.tail.SlicerType;
  import net.sf.tail.Strategy;
  import net.sf.tail.TimeSeries;
--- 11,14 ----
***************
*** 22,26 ****
  import net.sf.tail.runner.HistoryRunner;
  import net.sf.tail.sample.SampleTimeSeries;
! import net.sf.tail.series.SlicerByTimePeriod;
  import net.sf.tail.strategy.FakeStrategy;
  
--- 21,25 ----
  import net.sf.tail.runner.HistoryRunner;
  import net.sf.tail.sample.SampleTimeSeries;
! import net.sf.tail.series.RegularSlicer;
  import net.sf.tail.strategy.FakeStrategy;
  
***************
*** 40,44 ****
  	private BestStrategyEvaluator evaluator;
  
! 	private SlicerByTimePeriod slicer;
  
  	private HashSet<Strategy> strategies;
--- 39,43 ----
  	private BestStrategyEvaluator evaluator;
  
! 	private RegularSlicer slicer;
  
  	private HashSet<Strategy> strategies;
***************
*** 51,55 ****
  	public void setUp() throws Exception {
  		this.stock = new Stock("Teste", "BaseBovespa/15min/ambv4.csv", new CedroTimeSeriesLoader());
! 		
  		this.applyedCriterion = new TotalProfitCriterion();
  		Period period = new Period().withYears(1);
--- 50,54 ----
  	public void setUp() throws Exception {
  		this.stock = new Stock("Teste", "BaseBovespa/15min/ambv4.csv", new CedroTimeSeriesLoader());
! 
  		this.applyedCriterion = new TotalProfitCriterion();
  		Period period = new Period().withYears(1);
***************
*** 60,64 ****
  				date.withDate(2003, 3, 1));
  
! 		slicer = new SlicerByTimePeriod(series, period, date.withYear(2000).withMonthOfYear(7), SlicerType.REGULAR);
  		Runner runner = new HistoryRunner(OperationType.BUY);
  		evaluator = new BestStrategyEvaluator(runner);
--- 59,63 ----
  				date.withDate(2003, 3, 1));
  
! 		slicer = new RegularSlicer(series, period, date.withYear(2000).withMonthOfYear(7));
  		Runner runner = new HistoryRunner(OperationType.BUY);
  		evaluator = new BestStrategyEvaluator(runner);
***************
*** 80,89 ****
  	@Test
  	public void testCreateReport() {
! 		assertEquals(report, stockAnalysis.createReport("",strategies));
  	}
  
  	@Test
  	public void testAddCriterionAndCriteria() {
! 		stockAnalysis.createReport("",strategies);
  		stockAnalysis.addCriterion(new NumberOfTicksCriterion());
  		assertEquals(1, stockAnalysis.getAdditionalCriteria().size());
--- 79,88 ----
  	@Test
  	public void testCreateReport() {
! 		assertEquals(report, stockAnalysis.createReport("", strategies));
  	}
  
  	@Test
  	public void testAddCriterionAndCriteria() {
! 		stockAnalysis.createReport("", strategies);
  		stockAnalysis.addCriterion(new NumberOfTicksCriterion());
  		assertEquals(1, stockAnalysis.getAdditionalCriteria().size());