[Tail-cvs] Tail/src/test/net/sf/tail/indicator/tracker ParabolicSarIndicatorTest.java, 1.4

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

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

Modified Files:
	ParabolicSarIndicatorTest.java 
Log Message:
Mudancas no parabolic sar

Index: ParabolicSarIndicatorTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/tracker/ParabolicSarIndicatorTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ParabolicSarIndicatorTest.java	17 Oct 2007 18:29:56 -0000	1.3
--- ParabolicSarIndicatorTest.java	17 Oct 2007 20:06:17 -0000	1.4
***************
*** 21,36 ****
  		ticks.add(new Tick(0, 6, 9, 4));
  		ticks.add(new Tick(0, 11, 15, 9));
! 		ticks.add(new Tick(0, 13, 14, 9));
  		ParabolicSarIndicator sar = new ParabolicSarIndicator(new SampleTimeSeries(ticks), 1);
  		
  		assertEquals(10d, sar.getValue(0));
! 		double value = 10d + 0.02d * (6d - 10d);
! 		assertEquals(value , sar.getValue(1));
! 		value = value + (0.04d * (4d - value));
! 		assertEquals(value, sar.getValue(2));
! 		value = value + 0.02d * (15d - value);
! 		assertEquals(value, sar.getValue(3));
! 		value = value + 0.02d * (14d - value);
! 		assertEquals(value, sar.getValue(4));
  		
  	}
--- 21,32 ----
  		ticks.add(new Tick(0, 6, 9, 4));
  		ticks.add(new Tick(0, 11, 15, 9));
! 		ticks.add(new Tick(0, 13, 15, 9));
  		ParabolicSarIndicator sar = new ParabolicSarIndicator(new SampleTimeSeries(ticks), 1);
  		
  		assertEquals(10d, sar.getValue(0));
! 		assertEquals(8d, sar.getValue(1));
! 		assertEquals(11d, sar.getValue(2));
! 		assertEquals(4d, sar.getValue(3));
! 		assertEquals(4d, sar.getValue(4));
  		
  	}
***************
*** 40,60 ****
  	{
  		List<Tick> ticks = new ArrayList<Tick>();
! 		ticks.add(new Tick(0, 10, 16, 11));
! 		ticks.add(new Tick(0, 12, 15, 12));
! 		ticks.add(new Tick(0, 13, 12, 11));
! 		ticks.add(new Tick(0, 14, 13, 7));
  		ticks.add(new Tick(0, 9, 15, 9));
  		
! 		ParabolicSarIndicator sar = new ParabolicSarIndicator(new SampleTimeSeries(ticks), 3);
  		
  		assertEquals(10d, sar.getValue(0));
! 		double value = 10d + 0.02d * (16d - 10d);
! 		assertEquals(value, sar.getValue(1));
! 		value = value + 0.02d * (16d - value);
! 		assertEquals(value, sar.getValue(2));
! 		value = value + 0.02d * (15d - value);
! 		assertEquals(value, sar.getValue(3));
! 		value = value + 0.02d * (7d - value);
! 		assertEquals(value, sar.getValue(4));
  	}
  	@Test
--- 36,53 ----
  	{
  		List<Tick> ticks = new ArrayList<Tick>();
! 		ticks.add(new Tick(0, 10, 13, 11));
! 		ticks.add(new Tick(0, 10, 15, 13));
! 		ticks.add(new Tick(0, 12, 18, 11));
! 		ticks.add(new Tick(0, 10, 15, 9));
  		ticks.add(new Tick(0, 9, 15, 9));
  		
! 		ParabolicSarIndicator sar = new ParabolicSarIndicator(new SampleTimeSeries(ticks), 1);
  		
  		assertEquals(10d, sar.getValue(0));
! 		assertEquals(10d, sar.getValue(1));
! 		assertEquals(0.04 * (18d - 10) + 10d, sar.getValue(2));
! 		assertEquals(18d, sar.getValue(3));
! 		assertEquals(18d, sar.getValue(3));
! 		assertEquals(18d, sar.getValue(4));
  	}
  	@Test
***************
*** 63,83 ****
  		List<Tick> ticks = new ArrayList<Tick>();
  		ticks.add(new Tick(0, 10, 13, 11));
! 		ticks.add(new Tick(0, 17, 15, 12));
  		ticks.add(new Tick(0, 18, 16, 14));
  		ticks.add(new Tick(0, 19, 17, 12));
! 		ticks.add(new Tick(0, 20, 16, 9));
  		
! 		ParabolicSarIndicator sar = new ParabolicSarIndicator(new SampleTimeSeries(ticks), 2);
  		
! 		double value = 10d;
! 		assertEquals(value, sar.getValue(0));
! 		value = value + 0.02d * (15d - value);
! 		assertEquals(value, sar.getValue(1));
! 		value = value + 0.04d * (16d - value);
! 		assertEquals(value, sar.getValue(2));
! 		value = value + 0.06d * (17d - value);
! 		assertEquals(value, sar.getValue(3));
! 		value = value + 0.06d * (17d - value);
! 		assertEquals(value, sar.getValue(4));
  	}
  	
--- 56,71 ----
  		List<Tick> ticks = new ArrayList<Tick>();
  		ticks.add(new Tick(0, 10, 13, 11));
! 		ticks.add(new Tick(0, 17, 15, 11.38));
  		ticks.add(new Tick(0, 18, 16, 14));
  		ticks.add(new Tick(0, 19, 17, 12));
! 		ticks.add(new Tick(0, 20, 18, 9));
  		
! 		ParabolicSarIndicator sar = new ParabolicSarIndicator(new SampleTimeSeries(ticks), 1);
  		
! 		assertEquals(10d, sar.getValue(0));
! 		assertEquals(17d, sar.getValue(1));
! 		assertEquals(11.38d, sar.getValue(2));
! 		assertEquals(11.38d, sar.getValue(3));
! 		assertEquals(18d, sar.getValue(4));
  	}
  	
***************
*** 87,110 ****
  		List<Tick> ticks = new ArrayList<Tick>();
  		ticks.add(new Tick(0, 20, 18, 9));
! 		ticks.add(new Tick(0, 19, 17, 8));
! 		ticks.add(new Tick(0, 18, 16, 9));
! 		ticks.add(new Tick(0, 17, 15, 9));
! 		ticks.add(new Tick(0, 10, 13, 6));
! 		ticks.add(new Tick(0, 9, 30, 8));
  		
! 		ParabolicSarIndicator sar = new ParabolicSarIndicator(new SampleTimeSeries(ticks), 3);
  		
! 		double value = 20d;
! 		assertEquals(value, sar.getValue(0));
! 		value = value + 0.02d * (8d - value);
! 		assertEquals(value, sar.getValue(1));
! 		value = value + 0.02d * (8d - value);
! 		assertEquals(value, sar.getValue(2));
! 		value = value + 0.02d * (8d - value);
! 		assertEquals(value, sar.getValue(3));
! 		value = value + 0.04d * (6d - value);
! 		assertEquals(value, sar.getValue(4));
! 		value = value + 0.04d * (6d - value);
! 		assertEquals(value, sar.getValue(5));
  		
  	}
--- 75,93 ----
  		List<Tick> ticks = new ArrayList<Tick>();
  		ticks.add(new Tick(0, 20, 18, 9));
! 		ticks.add(new Tick(0, 19, 17, 12));
! 		ticks.add(new Tick(0, 18, 16, 14));
! 		ticks.add(new Tick(0, 17, 15, 11.38));
! 		ticks.add(new Tick(0, 10, 13, 11));
! 		ticks.add(new Tick(0, 10, 30, 11));
  		
! 		ParabolicSarIndicator sar = new ParabolicSarIndicator(new SampleTimeSeries(ticks), 1);
  		
! 		assertEquals(20d, sar.getValue(0));
! 		assertEquals(19d, sar.getValue(1));
! 		assertEquals(0.04d * (14d - 19d) + 19d, sar.getValue(2));
! 		double value = 0.06d * (11.38d - 18.8d) + 18.8d;
! 		assertEquals(0.06d * (11.38d - 18.8d) + 18.8d, sar.getValue(3));
! 		assertEquals(0.08d * (11d - value) + value, sar.getValue(4));
! 		assertEquals(11d, sar.getValue(5));
  		
  	}