tail-cvs

[Carlos <ma...@us...>]

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

Modified Files:
	SampleTimeSeries.java 
Log Message:
Refatoracao necessaria para o Forex...

Index: SampleTimeSeries.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/sample/SampleTimeSeries.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SampleTimeSeries.java	7 Nov 2007 22:22:10 -0000	1.1
--- SampleTimeSeries.java	7 Nov 2007 23:40:48 -0000	1.2
***************
*** 4,9 ****
  import java.util.List;
  
- import net.sf.tail.Tick;
  import net.sf.tail.TimeSeries;
  
  import org.joda.time.DateTime;
--- 4,9 ----
  import java.util.List;
  
  import net.sf.tail.TimeSeries;
+ import net.sf.tail.tick.DefaultTick;
  
  import org.joda.time.DateTime;
***************
*** 12,25 ****
  public class SampleTimeSeries implements TimeSeries {
  
! 	private List<Tick> ticks;
  
  	public SampleTimeSeries(double... data) {
! 		ticks = new ArrayList<Tick>();
  		for (int i = 0; i < data.length; i++) {
! 			ticks.add(new Tick(data[i]));
  		}
  	}
  
! 	public SampleTimeSeries(List<Tick> ticks) {
  		this.ticks = ticks;
  	}
--- 12,25 ----
  public class SampleTimeSeries implements TimeSeries {
  
! 	private List<DefaultTick> ticks;
  
  	public SampleTimeSeries(double... data) {
! 		ticks = new ArrayList<DefaultTick>();
  		for (int i = 0; i < data.length; i++) {
! 			ticks.add(new DefaultTick(data[i]));
  		}
  	}
  
! 	public SampleTimeSeries(List<DefaultTick> ticks) {
  		this.ticks = ticks;
  	}
***************
*** 29,55 ****
  			throw new IllegalArgumentException();
  		}
! 		ticks = new ArrayList<Tick>();
  		for (int i = 0; i < data.length; i++) {
! 			ticks.add(new Tick(data[i], times[i]));
  		}
  	}
  
  	public SampleTimeSeries(DateTime... dates) {
! 		ticks = new ArrayList<Tick>();
  		int i = 1;
  		for (DateTime date : dates) {
! 			ticks.add(new Tick(date, i++));
  		}
  	}
  
  	public SampleTimeSeries() {
! 		ticks = new ArrayList<Tick>();
  		for (double i = 0d; i < 10; i++) {
! 			Tick tick = new Tick(new DateTime(0), i, i + 1, i + 2, i + 3, i + 4, i + 5, i + 6, i + 7, (int) (i + 8));
  			ticks.add(tick);
  		}
  	}
  
! 	public Tick getTick(int i) {
  		return ticks.get(i);
  	}
--- 29,55 ----
  			throw new IllegalArgumentException();
  		}
! 		ticks = new ArrayList<DefaultTick>();
  		for (int i = 0; i < data.length; i++) {
! 			ticks.add(new DefaultTick(data[i], times[i]));
  		}
  	}
  
  	public SampleTimeSeries(DateTime... dates) {
! 		ticks = new ArrayList<DefaultTick>();
  		int i = 1;
  		for (DateTime date : dates) {
! 			ticks.add(new DefaultTick(date, i++));
  		}
  	}
  
  	public SampleTimeSeries() {
! 		ticks = new ArrayList<DefaultTick>();
  		for (double i = 0d; i < 10; i++) {
! 			DefaultTick tick = new DefaultTick(new DateTime(0), i, i + 1, i + 2, i + 3, i + 4, i + 5, i + 6, i + 7, (int) (i + 8));
  			ticks.add(tick);
  		}
  	}
  
! 	public DefaultTick getTick(int i) {
  		return ticks.get(i);
  	}