[Tail-cvs] TailS/src/java/net/sf/tails/swing/helper DefaultStrategiesGenerator.java, 1.7

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

Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6420/src/java/net/sf/tails/swing/helper

Modified Files:
	DefaultStrategiesGenerator.java 
Log Message:
NotSoFast adicionado como estratégia Default

Index: DefaultStrategiesGenerator.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper/DefaultStrategiesGenerator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DefaultStrategiesGenerator.java	29 Oct 2007 17:07:05 -0000	1.6
--- DefaultStrategiesGenerator.java	29 Oct 2007 18:02:35 -0000	1.7
***************
*** 20,23 ****
--- 20,24 ----
  import net.sf.tail.indicator.tracker.bollingerbands.BollingerBandsUpperIndicator;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
+ import net.sf.tail.strategy.NotSoFastStrategy;
  import net.sf.tail.strategy.PipeEnterStrategy;
  
***************
*** 32,36 ****
  
  	public Set<Strategy> generate(TimeSeries series,
! 			EnumIndicator indicatorName, int initial, int end) {
  
  		Set<Strategy> strategies = new HashSet<Strategy>();
--- 33,37 ----
  
  	public Set<Strategy> generate(TimeSeries series,
! 			EnumIndicator indicatorName, int initial, int end, boolean notSoFast) {
  
  		Set<Strategy> strategies = new HashSet<Strategy>();
***************
*** 38,42 ****
  		Indicator<? extends Number> indicator;
  		Strategy strategy;
! 
  		switch (indicatorName) {
  		case SMA:
--- 39,43 ----
  		Indicator<? extends Number> indicator;
  		Strategy strategy;
! 		
  		switch (indicatorName) {
  		case SMA:
***************
*** 44,49 ****
  				indicator = new SMAIndicator(close, i);
  				strategy = new IndicatorCrossedIndicatorStrategy(close,
! 						indicator);
! 				strategies.add(strategy);
  			}
  			LOG.info(indicatorDescription.getString("SMAIndicator"));
--- 45,53 ----
  				indicator = new SMAIndicator(close, i);
  				strategy = new IndicatorCrossedIndicatorStrategy(close,
! 							indicator);
! 				if(notSoFast)
! 					strategies.add(new NotSoFastStrategy(strategy, 3));
! 				else
! 					strategies.add(strategy);
  			}
  			LOG.info(indicatorDescription.getString("SMAIndicator"));
***************
*** 53,57 ****
  				indicator = new EMAIndicator(close, i);
  				strategy = new IndicatorCrossedIndicatorStrategy(close, indicator);
! 				strategies.add(strategy);
  			}
  			LOG.info(indicatorDescription.getString("EMAIndicator"));
--- 57,64 ----
  				indicator = new EMAIndicator(close, i);
  				strategy = new IndicatorCrossedIndicatorStrategy(close, indicator);
! 				if(notSoFast)
! 					strategies.add(new NotSoFastStrategy(strategy, 3));
! 				else
! 					strategies.add(strategy);
  			}
  			LOG.info(indicatorDescription.getString("EMAIndicator"));
***************
*** 64,68 ****
  						new ConstantIndicator<Number>(0.7 * close.getValue(i)),
  						indicator);
! 				strategies.add(strategy);
  			}
  			LOG.info(indicatorDescription.getString("RSIIndicator"));
--- 71,78 ----
  						new ConstantIndicator<Number>(0.7 * close.getValue(i)),
  						indicator);
! 				if(notSoFast)
! 					strategies.add(new NotSoFastStrategy(strategy, 3));
! 				else
! 					strategies.add(strategy);
  			}
  			LOG.info(indicatorDescription.getString("RSIIndicator"));
***************
*** 82,86 ****
  				strategy = new PipeEnterStrategy(upper, lower, close);
  
! 				strategies.add(strategy);
  			}
  			LOG.info(indicatorDescription.getString("BollingerBandsIndicator"));
--- 92,99 ----
  				strategy = new PipeEnterStrategy(upper, lower, close);
  
! 				if(notSoFast)
! 					strategies.add(new NotSoFastStrategy(strategy, 3));
! 				else
! 					strategies.add(strategy);
  			}
  			LOG.info(indicatorDescription.getString("BollingerBandsIndicator"));
***************
*** 90,94 ****
  				indicator = new ParabolicSarIndicator(series, i);
  				strategy = new IndicatorCrossedIndicatorStrategy(indicator, close);
! 				strategies.add(strategy);
  			}
  			LOG.info(indicatorDescription.getString("ParabolicSarIndicator"));
--- 103,110 ----
  				indicator = new ParabolicSarIndicator(series, i);
  				strategy = new IndicatorCrossedIndicatorStrategy(indicator, close);
! 				if(notSoFast)
! 					strategies.add(new NotSoFastStrategy(strategy, 3));
! 				else
! 					strategies.add(strategy);
  			}
  			LOG.info(indicatorDescription.getString("ParabolicSarIndicator"));
***************
*** 100,104 ****
  				indicator = new WMAIndicator(close, i);
  				strategy = new IndicatorCrossedIndicatorStrategy(close, indicator);
! 				strategies.add(strategy);
  			}
  			LOG.info(indicatorDescription.getString("WMAIndicator"));
--- 116,123 ----
  				indicator = new WMAIndicator(close, i);
  				strategy = new IndicatorCrossedIndicatorStrategy(close, indicator);
! 				if(notSoFast)
! 					strategies.add(new NotSoFastStrategy(strategy, 3));
! 				else
! 					strategies.add(strategy);
  			}
  			LOG.info(indicatorDescription.getString("WMAIndicator"));