tail-cvs

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

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

Modified Files:
	WorkbookGeneratorTest.java ReportXlsGeneratorTest.java 
	TImeSeriesXlsGeneratorTest.java SliceXlsGeneratorTest.java 
Log Message:
Refatoração nos scripts

Index: WorkbookGeneratorTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/xls/WorkbookGeneratorTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** WorkbookGeneratorTest.java	21 Nov 2007 21:55:20 -0000	1.4
--- WorkbookGeneratorTest.java	5 Dec 2007 23:22:45 -0000	1.5
***************
*** 25,28 ****
--- 25,29 ----
  import net.sf.tail.sample.SampleTimeSeries;
  import net.sf.tail.series.FullyMemorizedSlicer;
+ import net.sf.tail.strategiesSet.JavaStrategiesSet;
  import net.sf.tail.strategy.FakeStrategy;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
***************
*** 89,93 ****
  		}
  		charts.add(file);
! 		report = new Report(strategies, new TotalProfitCriterion(), slicer, decisions);
  
  		book = Workbook.generate(report, period, charts);
--- 90,94 ----
  		}
  		charts.add(file);
! 		report = new Report(new JavaStrategiesSet( strategies), new TotalProfitCriterion(), slicer, decisions);
  
  		book = Workbook.generate(report, period, charts);

Index: SliceXlsGeneratorTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/xls/SliceXlsGeneratorTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SliceXlsGeneratorTest.java	21 Nov 2007 21:55:20 -0000	1.5
--- SliceXlsGeneratorTest.java	5 Dec 2007 23:22:45 -0000	1.6
***************
*** 25,28 ****
--- 25,29 ----
  import net.sf.tail.sample.SampleTimeSeries;
  import net.sf.tail.series.FullyMemorizedSlicer;
+ import net.sf.tail.strategiesSet.JavaStrategiesSet;
  import net.sf.tail.strategy.FakeStrategy;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
***************
*** 91,95 ****
  		}
  
! 		report = new Report(strategies, new TotalProfitCriterion(), slicer, decisions);
  
  		sheet = XLSSlicerSeries.generate(report, period, charts);
--- 92,96 ----
  		}
  
! 		report = new Report(new JavaStrategiesSet( strategies), new TotalProfitCriterion(), slicer, decisions);
  
  		sheet = XLSSlicerSeries.generate(report, period, charts);

Index: ReportXlsGeneratorTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/xls/ReportXlsGeneratorTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ReportXlsGeneratorTest.java	21 Nov 2007 21:55:20 -0000	1.5
--- ReportXlsGeneratorTest.java	5 Dec 2007 23:22:45 -0000	1.6
***************
*** 25,28 ****
--- 25,29 ----
  import net.sf.tail.sample.SampleTimeSeries;
  import net.sf.tail.series.FullyMemorizedSlicer;
+ import net.sf.tail.strategiesSet.JavaStrategiesSet;
  import net.sf.tail.strategy.FakeStrategy;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
***************
*** 90,94 ****
  		}
  
! 		report = new Report(strategies, new TotalProfitCriterion(), slicer, decisions);
  
  		sheet = XLSReportSeries.generate(report, period, charts);
--- 91,95 ----
  		}
  
! 		report = new Report(new JavaStrategiesSet( strategies), new TotalProfitCriterion(), slicer, decisions);
  
  		sheet = XLSReportSeries.generate(report, period, charts);

Index: TImeSeriesXlsGeneratorTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/xls/TImeSeriesXlsGeneratorTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TImeSeriesXlsGeneratorTest.java	3 Dec 2007 18:24:20 -0000	1.4
--- TImeSeriesXlsGeneratorTest.java	5 Dec 2007 23:22:45 -0000	1.5
***************
*** 21,24 ****
--- 21,25 ----
  import net.sf.tail.sample.SampleTimeSeries;
  import net.sf.tail.series.FullyMemorizedSlicer;
+ import net.sf.tail.strategiesSet.JavaStrategiesSet;
  import net.sf.tail.strategy.FakeStrategy;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
***************
*** 63,67 ****
  		}
  		
! 		Report report = new Report(strategies, new TotalProfitCriterion(), slicer, decisions);
  		
  		HSSFSheet sheet = XLStimeSeries.generate(report);
--- 64,68 ----
  		}
  		
! 		Report report = new Report(new JavaStrategiesSet( strategies), new TotalProfitCriterion(), slicer, decisions);
  		
  		HSSFSheet sheet = XLStimeSeries.generate(report);