[Tail-cvs] Tail/src/java/net/sf/tail/graphics FasterDataset.java, 1.3

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

Update of /cvsroot/tail/Tail/src/java/net/sf/tail/graphics
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1301/src/java/net/sf/tail/graphics

Modified Files:
	FasterDataset.java 
Log Message:
Refatoracao

Index: FasterDataset.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/graphics/FasterDataset.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FasterDataset.java	24 Oct 2007 19:42:43 -0000	1.2
--- FasterDataset.java	24 Oct 2007 20:31:29 -0000	1.3
***************
*** 25,50 ****
  	private TimeSeries series;
  
! 	public FasterDataset(TimeSeries series, List<Indicator<? extends Number>> indicators, int firstIndex, int lastIndex) {
  		this.data = new DefaultKeyedValues2D();
  		this.indicators = indicators;
  		this.series = series;
  				
! 		if(lastIndex - firstIndex > 800)
! 			loadValuesFaster(firstIndex, lastIndex);
  		else
! 			loadValues(firstIndex, lastIndex);
  	}
  
! 	public FasterDataset(TimeSeries timeSeries, int seriesSize) {
! 		this(timeSeries, Collections.nCopies(1, new ClosePriceIndicator(timeSeries)), timeSeries.getBegin(), timeSeries.getBegin() + seriesSize - 1);
  	}
! 	public FasterDataset(TimeSeries series, int seriesSize, boolean doFast) {
  		this.data = new DefaultKeyedValues2D();
  		this.indicators = Collections.nCopies(1, new ClosePriceIndicator(series));
  		this.series = series;
  		if(doFast)
! 			loadValuesFaster(series.getBegin(), series.getBegin() + seriesSize - 1);
  		else
! 			loadValues(series.getBegin(), series.getBegin() + seriesSize - 1);
  	}
  
--- 25,50 ----
  	private TimeSeries series;
  
! 	public FasterDataset(TimeSeries series, List<Indicator<? extends Number>> indicators) {
  		this.data = new DefaultKeyedValues2D();
  		this.indicators = indicators;
  		this.series = series;
  				
! 		if(series.getSize() > 800)
! 			loadValuesFaster(series.getBegin(), series.getEnd());
  		else
! 			loadValues(series.getBegin(), series.getEnd());
  	}
  
! 	public FasterDataset(TimeSeries timeSeries) {
! 		this(timeSeries, Collections.nCopies(1, new ClosePriceIndicator(timeSeries)));
  	}
! 	public FasterDataset(TimeSeries series, boolean doFast) {
  		this.data = new DefaultKeyedValues2D();
  		this.indicators = Collections.nCopies(1, new ClosePriceIndicator(series));
  		this.series = series;
  		if(doFast)
! 			loadValuesFaster(series.getBegin(), series.getEnd());
  		else
! 			loadValues(series.getBegin(), series.getEnd());
  	}