[Tail-cvs] Tail/src/test/net/sf/tail/sample SampleTimeSeries.java, 1.6 SampleIndicator.java, 1.4

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

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

Modified Files:
	SampleTimeSeries.java SampleIndicator.java 
Log Message:
mega merge erefatoração de código e correção de testes

Index: SampleTimeSeries.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/sample/SampleTimeSeries.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SampleTimeSeries.java	2 Aug 2007 23:40:25 -0000	1.5
--- SampleTimeSeries.java	4 Aug 2007 02:34:18 -0000	1.6
***************
*** 2,13 ****
  
  import java.util.ArrayList;
- import java.util.Calendar;
  import java.util.List;
  
- import org.joda.time.DateTime;
- 
  import net.sf.tail.Tick;
  import net.sf.tail.TimeSeries;
  
  public class SampleTimeSeries implements TimeSeries {
  
--- 2,12 ----
  
  import java.util.ArrayList;
  import java.util.List;
  
  import net.sf.tail.Tick;
  import net.sf.tail.TimeSeries;
  
+ import org.joda.time.DateTime;
+ 
  public class SampleTimeSeries implements TimeSeries {
  
***************
*** 21,31 ****
  	}
  
- 	public SampleTimeSeries(DateTime[] times) {
- 		ticks = new ArrayList<Tick>();
- 		for (int i = 0; i < times.length; i++) {
- 			ticks.add(new Tick(times[i]));
- 		}
- 	}
- 
  	public SampleTimeSeries(double[] data, DateTime[] times) {
  		if(data.length != times.length) {
--- 20,23 ----
***************
*** 38,46 ****
  	}
  
  	public SampleTimeSeries() {
  		ticks = new ArrayList<Tick>();
  		for (double i = 0d; i < 10; i++) {
! 			Tick tick = new Tick(new DateTime(Calendar.getInstance()), i, i + 1, i + 2, i + 3, i + 4, i + 5, i + 6,
! 					i + 7, (int) (i + 8));
  			ticks.add(tick);
  		}
--- 30,46 ----
  	}
  
+ 	public SampleTimeSeries(DateTime ... dates) {
+ 		ticks = new ArrayList<Tick>();
+ 		int i = 0;
+ 		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(), i, i + 1, i + 2, i + 3, i + 4, i + 5, i + 6, i + 7,
! 					(int) (i + 8));
  			ticks.add(tick);
  		}

Index: SampleIndicator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/sample/SampleIndicator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SampleIndicator.java	2 Aug 2007 15:44:46 -0000	1.3
--- SampleIndicator.java	4 Aug 2007 02:34:18 -0000	1.4
***************
*** 2,6 ****
  
  import java.util.ArrayList;
- import java.util.Arrays;
  import java.util.List;
  
--- 2,5 ----