tail-cvs

[Márcio V. d. S. <mv...@us...>]

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

Modified Files:
	SerializerTest.java 
Log Message:
refatoração gigante! Stock virou TimeSeries

Index: SerializerTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/io/SerializerTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** SerializerTest.java	8 Oct 2007 19:38:15 -0000	1.10
--- SerializerTest.java	15 Oct 2007 20:23:25 -0000	1.11
***************
*** 12,16 ****
  import net.sf.tail.Strategy;
  import net.sf.tail.TimeSeriesSlicer;
! import net.sf.tail.analysis.Stock;
  import net.sf.tail.analysis.StockAnalysis;
  import net.sf.tail.analysis.criteria.AverageProfitCriterion;
--- 12,16 ----
  import net.sf.tail.Strategy;
  import net.sf.tail.TimeSeriesSlicer;
! import net.sf.tail.analysis.SerializableTimeSeries;
  import net.sf.tail.analysis.StockAnalysis;
  import net.sf.tail.analysis.criteria.AverageProfitCriterion;
***************
*** 40,44 ****
  	private HistoryRunner runner;
  
! 	private Stock stock;
  
  	private HigherValueEvaluator evaluator;
--- 40,44 ----
  	private HistoryRunner runner;
  
! 	private SerializableTimeSeries stock;
  
  	private HigherValueEvaluator evaluator;
***************
*** 46,51 ****
  	@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);
--- 46,51 ----
  	@Before
  	public void setUp() throws Exception {
! 		stock = new SerializableTimeSeries("test", "BaseBovespa/tests/Cedro-ReaderTest.csv", new CedroTimeSeriesLoader());
! 		slicer = new FullyMemorizedSlicer(stock, new Period().withDays(1));
  
  		runner = new HistoryRunner(OperationType.BUY);
***************
*** 60,64 ****
  		StockSerializer serializer = new StockSerializer();
  		String serializedStock = serializer.toXML(stock);
! 		Stock newStock = serializer.fromXML(serializedStock);
  		assertEquals(stock, newStock);
  		assertEquals(stock.getSeries(), newStock.getSeries());
--- 60,64 ----
  		StockSerializer serializer = new StockSerializer();
  		String serializedStock = serializer.toXML(stock);
! 		SerializableTimeSeries newStock = serializer.fromXML(serializedStock);
  		assertEquals(stock, newStock);
  		assertEquals(stock.getSeries(), newStock.getSeries());
***************
*** 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);
--- 77,81 ----
  
  		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);
***************
*** 83,92 ****
  		}
  
! 		stockAnalysis.createReport("", strategies);
  
  		strategies = new HashSet<Strategy>();
  
  		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);
--- 83,92 ----
  		}
  
! 		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);
***************
*** 94,109 ****
  		}
  
! 		stockAnalysis.createReport("", strategies);
  
  		strategies = new HashSet<Strategy>();
  
  		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);
  		}
  
! 		stockAnalysis.createReport("", strategies);
  
  		StockAnalysisSerializer serializer = new StockAnalysisSerializer();
--- 94,109 ----
  		}
  
! 		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();