[Tail-cvs] Tail/src/test/net/sf/tail/io SerializerTest.java,1.9

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

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

Modified Files:
	SerializerTest.java 
Log Message:
Arrumando testes do Serializer. Refatoração da classe PartialMemorizedSlicer quando periodsPerSlice menor que 1 e testes da classe

Index: SerializerTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/io/SerializerTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** SerializerTest.java	3 Oct 2007 22:56:47 -0000	1.8
--- SerializerTest.java	8 Oct 2007 19:15:28 -0000	1.9
***************
*** 8,16 ****
  import java.util.Set;
  
- import net.sf.tail.Evaluator;
  import net.sf.tail.Indicator;
  import net.sf.tail.OperationType;
  import net.sf.tail.Strategy;
- import net.sf.tail.TimeSeries;
  import net.sf.tail.TimeSeriesSlicer;
  import net.sf.tail.analysis.Stock;
--- 8,14 ----
***************
*** 27,35 ****
  import net.sf.tail.io.reader.CedroTimeSeriesLoader;
  import net.sf.tail.runner.HistoryRunner;
- import net.sf.tail.sample.SampleTimeSeries;
  import net.sf.tail.series.FullyMemorizedSlicer;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
  
- import org.joda.time.DateTime;
  import org.joda.time.Period;
  import org.junit.Before;
--- 25,31 ----
***************
*** 38,45 ****
  public class SerializerTest {
  
- 	private DateTime date;
- 
- 	private TimeSeries timeSeries;
- 
  	private TotalProfitCriterion applyedCriterion;
  
--- 34,37 ----
***************
*** 48,65 ****
  	private HistoryRunner runner;
  
  	@Before
  	public void setUp() throws Exception {
! 		date = new DateTime();
  
- 		timeSeries = new SampleTimeSeries(date.withYear(2000), date.withDate(2000, 2, 20), date.withDate(2000, 4, 25),
- 				date.withYear(2002), date.withYear(2003));
  		runner = new HistoryRunner(OperationType.BUY);
  		applyedCriterion = new TotalProfitCriterion();
! 		slicer = new FullyMemorizedSlicer(timeSeries, new Period().withDays(1));
  	}
  
  	@Test
  	public void testStockSerializer() throws FileNotFoundException, IOException {
- 		Stock stock = new Stock("test", "BaseBovespa/15min/ambv4.csv", new CedroTimeSeriesLoader());
  		StockSerializer serializer = new StockSerializer();
  		String serializedStock = serializer.toXML(stock);
--- 40,61 ----
  	private HistoryRunner runner;
  
+ 	private Stock stock;
+ 
+ 	private BestStrategyEvaluator evaluator;
+ 
  	@Before
  	public void setUp() throws Exception {
! 		stock = new Stock("test", "BaseBovespa/tests/Cedro-ReaderTest.csv", new CedroTimeSeriesLoader());
! 		slicer = new FullyMemorizedSlicer(stock.getSeries(), new Period().withDays(1));
  
  		runner = new HistoryRunner(OperationType.BUY);
+ 		evaluator = new BestStrategyEvaluator(runner);
+ 
  		applyedCriterion = new TotalProfitCriterion();
! 
  	}
  
  	@Test
  	public void testStockSerializer() throws FileNotFoundException, IOException {
  		StockSerializer serializer = new StockSerializer();
  		String serializedStock = serializer.toXML(stock);
***************
*** 72,78 ****
  	public void testStockAnalysisSerializer() throws FileNotFoundException, IOException {
  
- 		Stock stock = new Stock("test", "BaseBovespa/15min/ambv4.csv", new CedroTimeSeriesLoader());
- 
- 		Evaluator evaluator = new BestStrategyEvaluator(runner);
  		StockAnalysis stockAnalysis = new StockAnalysis(stock, applyedCriterion, slicer, evaluator);
  
--- 68,71 ----
***************
*** 84,88 ****
  
  		for (int i = 4; i < 20; i++) {
! 			Indicator<Double> close = new ClosePriceIndicator(timeSeries);
  			Indicator<Double> tracker = new EMAIndicator(close, i);
  			Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker);
--- 77,81 ----
  
  		for (int i = 4; i < 20; i++) {
! 			Indicator<Double> close = new ClosePriceIndicator(stock.getSeries());
  			Indicator<Double> tracker = new EMAIndicator(close, i);
  			Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker);
***************
*** 95,99 ****
  
  		for (int i = 4; i < 20; i++) {
! 			Indicator<Double> close = new ClosePriceIndicator(timeSeries);
  			Indicator<Double> tracker = new SMAIndicator(close, i);
  			Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker);
--- 88,92 ----
  
  		for (int i = 4; i < 20; i++) {
! 			Indicator<Double> close = new ClosePriceIndicator(stock.getSeries());
  			Indicator<Double> tracker = new SMAIndicator(close, i);
  			Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker);
***************
*** 106,111 ****
  
  		for (int i = 4; i < 20; i++) {
! 			Indicator<Double> close = new ClosePriceIndicator(timeSeries);
! 			Indicator<Double> tracker = new WilliamsRIndicator(timeSeries, i);
  			Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker);
  			strategies.add(strategy);
--- 99,104 ----
  
  		for (int i = 4; i < 20; i++) {
! 			Indicator<Double> close = new ClosePriceIndicator(stock.getSeries());
! 			Indicator<Double> tracker = new WilliamsRIndicator(stock.getSeries(), i);
  			Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker);
  			strategies.add(strategy);