[Tail-cvs] Tail/src/test/net/sf/tail/graphics FasterCriteriaDatasetTest.java, 1.4 CriteriaDatasetTest.java, 1.9

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

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

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

Index: CriteriaDatasetTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/CriteriaDatasetTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CriteriaDatasetTest.java	21 Nov 2007 22:19:51 -0000	1.8
--- CriteriaDatasetTest.java	5 Dec 2007 23:22:46 -0000	1.9
***************
*** 20,23 ****
--- 20,24 ----
  import net.sf.tail.series.DefaultTimeSeries;
  import net.sf.tail.series.RegularSlicer;
+ import net.sf.tail.strategiesSet.JavaStrategiesSet;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
  import net.sf.tail.tick.DefaultTick;
***************
*** 77,83 ****
  		TimeSeriesSlicer slice = new RegularSlicer(series, new Period().withDays(2));
  		AnalysisCriterion criterion = new TotalProfitCriterion();
! 		Report report1 = walk.walk(strategies, slice, criterion);
  		report1.setName("rep1");
! 		Report report2 = walk.walk(strategies2, slice, criterion);
  		report2.setName("rep2");
  		reports.add(report1);
--- 78,84 ----
  		TimeSeriesSlicer slice = new RegularSlicer(series, new Period().withDays(2));
  		AnalysisCriterion criterion = new TotalProfitCriterion();
! 		Report report1 = walk.walk(new JavaStrategiesSet( strategies), slice, criterion);
  		report1.setName("rep1");
! 		Report report2 = walk.walk(new JavaStrategiesSet( strategies2), slice, criterion);
  		report2.setName("rep2");
  		reports.add(report1);

Index: FasterCriteriaDatasetTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/FasterCriteriaDatasetTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FasterCriteriaDatasetTest.java	21 Nov 2007 21:55:20 -0000	1.3
--- FasterCriteriaDatasetTest.java	5 Dec 2007 23:22:46 -0000	1.4
***************
*** 19,22 ****
--- 19,23 ----
  import net.sf.tail.sample.SampleTimeSeries;
  import net.sf.tail.series.RegularSlicer;
+ import net.sf.tail.strategiesSet.JavaStrategiesSet;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
  import net.sf.tail.strategy.IndicatorOverIndicatorStrategy;
***************
*** 64,70 ****
  		TimeSeriesSlicer slice = new RegularSlicer(series, new Period().withDays(2));
  		AnalysisCriterion criterion = new TotalProfitCriterion();
! 		Report report1 = walk.walk(strategies, slice, criterion);
  		report1.setName("rep1");
! 		Report report2 = walk.walk(strategies2, slice, criterion);
  		report2.setName("rep2");
  		reports.add(report1);
--- 65,71 ----
  		TimeSeriesSlicer slice = new RegularSlicer(series, new Period().withDays(2));
  		AnalysisCriterion criterion = new TotalProfitCriterion();
! 		Report report1 = walk.walk(new JavaStrategiesSet( strategies), slice, criterion);
  		report1.setName("rep1");
! 		Report report2 = walk.walk(new JavaStrategiesSet( strategies2), slice, criterion);
  		report2.setName("rep2");
  		reports.add(report1);
***************
*** 110,116 ****
  		TimeSeriesSlicer slice = new RegularSlicer(series, new Period().withDays(2));
  		AnalysisCriterion criterion = new TotalProfitCriterion();
! 		Report report1 = walk.walk(strategies, slice, criterion);
  		report1.setName("rep1");
! 		Report report2 = walk.walk(strategies2, slice, criterion);
  		report2.setName("rep2");
  		reports.add(report1);
--- 111,117 ----
  		TimeSeriesSlicer slice = new RegularSlicer(series, new Period().withDays(2));
  		AnalysisCriterion criterion = new TotalProfitCriterion();
! 		Report report1 = walk.walk(new JavaStrategiesSet( strategies), slice, criterion);
  		report1.setName("rep1");
! 		Report report2 = walk.walk(new JavaStrategiesSet( strategies2), slice, criterion);
  		report2.setName("rep2");
  		reports.add(report1);
***************
*** 156,162 ****
  		TimeSeriesSlicer slice = new RegularSlicer(series, new Period().withDays(2));
  		AnalysisCriterion criterion = new TotalProfitCriterion();
! 		Report report1 = walk.walk(strategies, slice, criterion);
  		report1.setName("rep1");
! 		Report report2 = walk.walk(strategies2, slice, criterion);
  		report2.setName("rep2");
  		reports.add(report1);
--- 157,163 ----
  		TimeSeriesSlicer slice = new RegularSlicer(series, new Period().withDays(2));
  		AnalysisCriterion criterion = new TotalProfitCriterion();
! 		Report report1 = walk.walk(new JavaStrategiesSet( strategies), slice, criterion);
  		report1.setName("rep1");
! 		Report report2 = walk.walk(new JavaStrategiesSet( strategies2), slice, criterion);
  		report2.setName("rep2");
  		reports.add(report1);
***************
*** 201,207 ****
  		TimeSeriesSlicer slice = new RegularSlicer(series, new Period().withDays(2));
  		AnalysisCriterion criterion = new TotalProfitCriterion();
! 		Report report1 = walk.walk(strategies, slice, criterion);
  		report1.setName("rep1");
! 		Report report2 = walk.walk(strategies2, slice, criterion);
  		report2.setName("rep2");
  		reports.add(report1);
--- 202,208 ----
  		TimeSeriesSlicer slice = new RegularSlicer(series, new Period().withDays(2));
  		AnalysisCriterion criterion = new TotalProfitCriterion();
! 		Report report1 = walk.walk(new JavaStrategiesSet( strategies), slice, criterion);
  		report1.setName("rep1");
! 		Report report2 = walk.walk(new JavaStrategiesSet( strategies2), slice, criterion);
  		report2.setName("rep2");
  		reports.add(report1);