[Tail-cvs] Tail/src/test/net/sf/tail/graphics CashFlowDatasetTest.java, 1.7 SeriesDatasetTest.java, 1.10 FasterCriteriaDatasetTest.java, 1.2 StockAndCashFlowDatasetTest.java, 1.5 CriteriaDatasetTest.java, 1.6 FasterDatasetTest.java, 1.4

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

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

Modified Files:
	CashFlowDatasetTest.java SeriesDatasetTest.java 
	FasterCriteriaDatasetTest.java 
	StockAndCashFlowDatasetTest.java CriteriaDatasetTest.java 
	FasterDatasetTest.java 
Log Message:
Refatoracao necessaria para o Forex...

Index: FasterDatasetTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/FasterDatasetTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FasterDatasetTest.java	31 Oct 2007 19:53:07 -0000	1.3
--- FasterDatasetTest.java	7 Nov 2007 23:40:48 -0000	1.4
***************
*** 6,11 ****
  import java.util.List;
  
- import net.sf.tail.Tick;
  import net.sf.tail.sample.SampleTimeSeries;
  
  import org.joda.time.DateTime;
--- 6,11 ----
  import java.util.List;
  
  import net.sf.tail.sample.SampleTimeSeries;
+ import net.sf.tail.tick.DefaultTick;
  
  import org.joda.time.DateTime;
***************
*** 18,30 ****
  	public void testFasterDataset()
  	{
! 		List<Tick> ticks = new ArrayList<Tick>();
! 		ticks.add(new Tick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 10, 11), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 11, 12), 6d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 12, 13), 7d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		FasterDataset dataset = new FasterDataset(series, true);
--- 18,30 ----
  	public void testFasterDataset()
  	{
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 10, 11), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 11, 12), 6d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 12, 13), 7d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		FasterDataset dataset = new FasterDataset(series, true);
***************
*** 35,47 ****
  	public void testFasterDatasetWithoutDoFast()
  	{
! 		List<Tick> ticks = new ArrayList<Tick>();
! 		ticks.add(new Tick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 10, 11), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 11, 12), 6d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 12, 13), 7d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		FasterDataset dataset = new FasterDataset(series);
--- 35,47 ----
  	public void testFasterDatasetWithoutDoFast()
  	{
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 10, 11), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 11, 12), 6d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 12, 13), 7d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		FasterDataset dataset = new FasterDataset(series);
***************
*** 52,64 ****
  	public void testFasterDatasetOnlyWithGains()
  	{
! 		List<Tick> ticks = new ArrayList<Tick>();
! 		ticks.add(new Tick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 10, 11), 6d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 11, 12), 7d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 12, 13), 8d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		FasterDataset dataset = new FasterDataset(series, true);
--- 52,64 ----
  	public void testFasterDatasetOnlyWithGains()
  	{
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 10, 11), 6d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 11, 12), 7d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 12, 13), 8d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		FasterDataset dataset = new FasterDataset(series, true);
***************
*** 68,80 ****
  	public void testFasterDatasetNotSoFast()
  	{
! 		List<Tick> ticks = new ArrayList<Tick>();
! 		ticks.add(new Tick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 10, 11), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 11, 12), 6d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 12, 13), 7d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		FasterDataset dataset = new FasterDataset(series, false);
--- 68,80 ----
  	public void testFasterDatasetNotSoFast()
  	{
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 10, 11), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 11, 12), 6d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 12, 13), 7d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		FasterDataset dataset = new FasterDataset(series, false);

Index: FasterCriteriaDatasetTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/FasterCriteriaDatasetTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FasterCriteriaDatasetTest.java	31 Oct 2007 19:53:07 -0000	1.1
--- FasterCriteriaDatasetTest.java	7 Nov 2007 23:40:48 -0000	1.2
***************
*** 11,15 ****
  import net.sf.tail.OperationType;
  import net.sf.tail.Strategy;
- import net.sf.tail.Tick;
  import net.sf.tail.TimeSeriesSlicer;
  import net.sf.tail.analysis.criteria.TotalProfitCriterion;
--- 11,14 ----
***************
*** 23,26 ****
--- 22,26 ----
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
  import net.sf.tail.strategy.IndicatorOverIndicatorStrategy;
+ import net.sf.tail.tick.DefaultTick;
  
  import org.joda.time.DateTime;
***************
*** 33,45 ****
  	public void testFasterCriteriaDatasetWithoutDoFast()
  	{
! 		List<Tick> ticks = new ArrayList<Tick>();
! 		ticks.add(new Tick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 10, 11), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 11, 12), 6d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 12, 13), 7d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		LinkedList<Report> reports;
--- 33,45 ----
  	public void testFasterCriteriaDatasetWithoutDoFast()
  	{
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 10, 11), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 11, 12), 6d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 12, 13), 7d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		LinkedList<Report> reports;
***************
*** 79,91 ****
  	public void testFasterCriteriaDatasetDoFast()
  	{
! 		List<Tick> ticks = new ArrayList<Tick>();
! 		ticks.add(new Tick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 10, 11), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 11, 12), 6d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 12, 13), 7d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		LinkedList<Report> reports;
--- 79,91 ----
  	public void testFasterCriteriaDatasetDoFast()
  	{
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 10, 11), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 11, 12), 6d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 12, 13), 7d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		LinkedList<Report> reports;
***************
*** 125,137 ****
  	public void testFasterCriteriaDatasetOnlyWithGains()
  	{
! 		List<Tick> ticks = new ArrayList<Tick>();
! 		ticks.add(new Tick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 10, 11), 6d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 11, 12), 7d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 12, 13), 8d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		LinkedList<Report> reports;
--- 125,137 ----
  	public void testFasterCriteriaDatasetOnlyWithGains()
  	{
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 10, 11), 6d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 11, 12), 7d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 12, 13), 8d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		LinkedList<Report> reports;
***************
*** 170,182 ****
  	public void testFasterCriteriaDatasetNotSoFast()
  	{
! 		List<Tick> ticks = new ArrayList<Tick>();
! 		ticks.add(new Tick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 10, 11), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 11, 12), 6d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 12, 13), 7d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		LinkedList<Report> reports;
--- 170,182 ----
  	public void testFasterCriteriaDatasetNotSoFast()
  	{
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 10, 11), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 11, 12), 6d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 12, 13), 7d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		LinkedList<Report> reports;

Index: SeriesDatasetTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/SeriesDatasetTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SeriesDatasetTest.java	24 Oct 2007 20:51:58 -0000	1.9
--- SeriesDatasetTest.java	7 Nov 2007 23:40:48 -0000	1.10
***************
*** 10,14 ****
  import net.sf.tail.Operation;
  import net.sf.tail.OperationType;
- import net.sf.tail.Tick;
  import net.sf.tail.TimeSeries;
  import net.sf.tail.Trade;
--- 10,13 ----
***************
*** 16,19 ****
--- 15,19 ----
  import net.sf.tail.sample.SampleTimeSeries;
  import net.sf.tail.series.DefaultTimeSeries;
+ import net.sf.tail.tick.DefaultTick;
  
  import org.joda.time.DateTime;
***************
*** 29,33 ****
  	List<Trade> trades;
  
! 	List<Tick> ticks;
  
  	private SampleIndicator indicator1;
--- 29,33 ----
  	List<Trade> trades;
  
! 	List<DefaultTick> ticks;
  
  	private SampleIndicator indicator1;
***************
*** 38,46 ****
  	public void setUp() throws Exception {
  
! 		ticks = new LinkedList<Tick>();
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 6), 1d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 8), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 4d));
  		
  
--- 38,46 ----
  	public void setUp() throws Exception {
  
! 		ticks = new LinkedList<DefaultTick>();
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 6), 1d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 8), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 9), 4d));
  		
  
***************
*** 100,106 ****
  	@Test
  	public void testMoveRight() {
! 		List<Tick> ticks = new ArrayList<Tick>();
  		ticks = this.ticks;
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 10), 4d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		List<Indicator<? extends Number>> indicators = new ArrayList<Indicator<? extends Number>>();
--- 100,106 ----
  	@Test
  	public void testMoveRight() {
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
  		ticks = this.ticks;
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 10), 4d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		List<Indicator<? extends Number>> indicators = new ArrayList<Indicator<? extends Number>>();
***************
*** 118,123 ****
  	@Test
  	public void testMoveLeft() {
! 		List<Tick> ticks = this.ticks;
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 10), 4d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		List<Indicator<? extends Number>> indicators = new ArrayList<Indicator<? extends Number>>();
--- 118,123 ----
  	@Test
  	public void testMoveLeft() {
! 		List<DefaultTick> ticks = this.ticks;
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 10), 4d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		List<Indicator<? extends Number>> indicators = new ArrayList<Indicator<? extends Number>>();

Index: CriteriaDatasetTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/CriteriaDatasetTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CriteriaDatasetTest.java	31 Oct 2007 20:11:35 -0000	1.5
--- CriteriaDatasetTest.java	7 Nov 2007 23:40:48 -0000	1.6
***************
*** 11,15 ****
  import net.sf.tail.OperationType;
  import net.sf.tail.Strategy;
- import net.sf.tail.Tick;
  import net.sf.tail.TimeSeries;
  import net.sf.tail.TimeSeriesSlicer;
--- 11,14 ----
***************
*** 23,26 ****
--- 22,26 ----
  import net.sf.tail.series.RegularSlicer;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
+ import net.sf.tail.tick.DefaultTick;
  
  import org.joda.time.DateTime;
***************
*** 35,39 ****
  	private List<Report> reports;
  
! 	private List<Tick> ticks;
  	
  	private Set<Strategy> strategies;
--- 35,39 ----
  	private List<Report> reports;
  
! 	private List<DefaultTick> ticks;
  	
  	private Set<Strategy> strategies;
***************
*** 48,64 ****
  	public void setUp() throws Exception {
  
! 		ticks = new LinkedList<Tick>();
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 6), 1d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 8), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 4d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 10), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 11), 1d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 12), 4d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 13), 6d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 14), 4d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 15), 6d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 16), 7d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 17), 8d));
  		
  		series = new DefaultTimeSeries(ticks);
--- 48,64 ----
  	public void setUp() throws Exception {
  
! 		ticks = new LinkedList<DefaultTick>();
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 6), 1d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 8), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 9), 4d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 10), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 11), 1d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 12), 4d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 13), 6d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 14), 4d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 15), 6d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 16), 7d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 17), 8d));
  		
  		series = new DefaultTimeSeries(ticks);

Index: CashFlowDatasetTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/CashFlowDatasetTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CashFlowDatasetTest.java	17 Oct 2007 16:41:53 -0000	1.6
--- CashFlowDatasetTest.java	7 Nov 2007 23:40:48 -0000	1.7
***************
*** 8,16 ****
  import net.sf.tail.Operation;
  import net.sf.tail.OperationType;
- import net.sf.tail.Tick;
  import net.sf.tail.TimeSeries;
  import net.sf.tail.Trade;
  import net.sf.tail.flow.CashFlow;
  import net.sf.tail.series.DefaultTimeSeries;
  
  import org.joda.time.DateTime;
--- 8,16 ----
  import net.sf.tail.Operation;
  import net.sf.tail.OperationType;
  import net.sf.tail.TimeSeries;
  import net.sf.tail.Trade;
  import net.sf.tail.flow.CashFlow;
  import net.sf.tail.series.DefaultTimeSeries;
+ import net.sf.tail.tick.DefaultTick;
  
  import org.joda.time.DateTime;
***************
*** 26,39 ****
  	List<Trade> trades;
  
! 	List<Tick> ticks;
  
  	@Before
  	public void setUp() throws Exception {
  
! 		ticks = new LinkedList<Tick>();
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 6), 1d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 8), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 4d));
  
  		series = new DefaultTimeSeries(ticks);
--- 26,39 ----
  	List<Trade> trades;
  
! 	List<DefaultTick> ticks;
  
  	@Before
  	public void setUp() throws Exception {
  
! 		ticks = new LinkedList<DefaultTick>();
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 6), 1d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 8), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 9), 4d));
  
  		series = new DefaultTimeSeries(ticks);
***************
*** 79,83 ****
  	@Test
  	public void testMoveRight() {
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 10), 4d));
  		series = new DefaultTimeSeries(ticks);
  		cashFlow = new CashFlow(series, trades);
--- 79,83 ----
  	@Test
  	public void testMoveRight() {
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 10), 4d));
  		series = new DefaultTimeSeries(ticks);
  		cashFlow = new CashFlow(series, trades);
***************
*** 92,96 ****
  	@Test
  	public void testMoveLeft() {
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 10), 4d));
  		series = new DefaultTimeSeries(ticks);
  		cashFlow = new CashFlow(series, trades);
--- 92,96 ----
  	@Test
  	public void testMoveLeft() {
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 10), 4d));
  		series = new DefaultTimeSeries(ticks);
  		cashFlow = new CashFlow(series, trades);

Index: StockAndCashFlowDatasetTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/StockAndCashFlowDatasetTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** StockAndCashFlowDatasetTest.java	17 Oct 2007 16:41:52 -0000	1.4
--- StockAndCashFlowDatasetTest.java	7 Nov 2007 23:40:48 -0000	1.5
***************
*** 8,12 ****
  import net.sf.tail.Operation;
  import net.sf.tail.OperationType;
- import net.sf.tail.Tick;
  import net.sf.tail.TimeSeries;
  import net.sf.tail.Trade;
--- 8,11 ----
***************
*** 14,17 ****
--- 13,17 ----
  import net.sf.tail.indicator.simple.ClosePriceIndicator;
  import net.sf.tail.series.DefaultTimeSeries;
+ import net.sf.tail.tick.DefaultTick;
  
  import org.joda.time.DateTime;
***************
*** 29,42 ****
  	List<Trade> trades;
  
! 	List<Tick> ticks;
  
  	@Before
  	public void setUp() throws Exception {
  
! 		ticks = new LinkedList<Tick>();
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 6), 1d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 8), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 4d));
  
  		series = new DefaultTimeSeries(ticks);
--- 29,42 ----
  	List<Trade> trades;
  
! 	List<DefaultTick> ticks;
  
  	@Before
  	public void setUp() throws Exception {
  
! 		ticks = new LinkedList<DefaultTick>();
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 6), 1d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 8), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 9), 4d));
  
  		series = new DefaultTimeSeries(ticks);