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

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

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

Modified Files:
	SerializerTest.java 
Log Message:
Alterado a sereliziação, agora o script é salvo ao inves de set de strategies

Index: SerializerTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/io/SerializerTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** SerializerTest.java	17 Oct 2007 16:51:44 -0000	1.12
--- SerializerTest.java	5 Nov 2007 23:16:10 -0000	1.13
***************
*** 5,14 ****
  import java.io.FileNotFoundException;
  import java.io.IOException;
- import java.util.HashSet;
- import java.util.Set;
  
- import net.sf.tail.Indicator;
  import net.sf.tail.OperationType;
- import net.sf.tail.Strategy;
  import net.sf.tail.TimeSeriesSlicer;
  import net.sf.tail.analysis.StockAnalysis;
--- 5,10 ----
***************
*** 18,30 ****
  import net.sf.tail.analysis.criteria.TotalProfitCriterion;
  import net.sf.tail.analysis.evaluator.HigherValueEvaluator;
- import net.sf.tail.indicator.simple.ClosePriceIndicator;
- import net.sf.tail.indicator.tracker.EMAIndicator;
- import net.sf.tail.indicator.tracker.SMAIndicator;
- import net.sf.tail.indicator.tracker.WilliamsRIndicator;
  import net.sf.tail.io.reader.CedroTimeSeriesLoader;
  import net.sf.tail.runner.HistoryRunner;
  import net.sf.tail.series.FullyMemorizedSlicer;
  import net.sf.tail.series.SerializableTimeSeries;
- import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
  
  import org.joda.time.Period;
--- 14,21 ----
***************
*** 74,109 ****
  		stockAnalysis.addCriterion(new NumberOfTicksCriterion());
  
! 		Set<Strategy> strategies = new HashSet<Strategy>();
! 
! 		for (int i = 4; i < 20; i++) {
! 			Indicator<Double> close = new ClosePriceIndicator(stock);
! 			Indicator<Double> tracker = new EMAIndicator(close, i);
! 			Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker);
! 			strategies.add(strategy);
! 		}
! 
! 		stockAnalysis.addReport("", strategies);
! 
! 		strategies = new HashSet<Strategy>();
! 
! 		for (int i = 4; i < 20; i++) {
! 			Indicator<Double> close = new ClosePriceIndicator(stock);
! 			Indicator<Double> tracker = new SMAIndicator(close, i);
! 			Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker);
! 			strategies.add(strategy);
! 		}
  
! 		stockAnalysis.addReport("", strategies);
  
! 		strategies = new HashSet<Strategy>();
  
! 		for (int i = 4; i < 20; i++) {
! 			Indicator<Double> close = new ClosePriceIndicator(stock);
! 			Indicator<Double> tracker = new WilliamsRIndicator(stock, i);
! 			Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker);
! 			strategies.add(strategy);
! 		}
  
! 		stockAnalysis.addReport("", strategies);
  
  		StockAnalysisSerializer serializer = new StockAnalysisSerializer();
--- 65,80 ----
  		stockAnalysis.addCriterion(new NumberOfTicksCriterion());
  
! 		
! 		String script = "(4..10).each{|numero| strategies.add(cross(ema(numero), close))}";
  
! 		stockAnalysis.addReport("", script);
! 		script = "(4..10).each{|numero|strategies.add(notSoFast(cross( parabolicSAR(numero), close), 3))}";
  
! 	
! 		stockAnalysis.addReport("", script);
  
! 		script = "(4..10).each{|numero|	strategies.add(notSoFast(cross(sma(numero), close), 3))}";
  
! 		stockAnalysis.addReport("", script);
  
  		StockAnalysisSerializer serializer = new StockAnalysisSerializer();