[Tail-cvs] Tail/src/test/net/sf/tail/analysis/criteria AverageProfitCriterionTest.java, 1.12 VersusBuyAndHoldCriterionTest.java, 1.6

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

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

Modified Files:
	AverageProfitCriterionTest.java 
	VersusBuyAndHoldCriterionTest.java 
Log Message:
acerto nos testes

Index: VersusBuyAndHoldCriterionTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/criteria/VersusBuyAndHoldCriterionTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** VersusBuyAndHoldCriterionTest.java	3 Oct 2007 18:57:45 -0000	1.5
--- VersusBuyAndHoldCriterionTest.java	17 Oct 2007 22:31:15 -0000	1.6
***************
*** 77,81 ****
  		AnalysisCriterion buyAndHold = new VersusBuyAndHoldCriterion(new AverageProfitCriterion());
  		
! 		assertEquals(Math.pow(95d/100 * 130d/100, 1d/5) / Math.pow(130d / 100, 1d/6), buyAndHold.calculate(series, trades) ,0.0001);
  	}
  	@Test
--- 77,81 ----
  		AnalysisCriterion buyAndHold = new VersusBuyAndHoldCriterion(new AverageProfitCriterion());
  		
! 		assertEquals(Math.pow(95d/100 * 130d/100, 1d/6) / Math.pow(130d / 100, 1d/6), buyAndHold.calculate(series, trades) ,0.0001);
  	}
  	@Test
***************
*** 89,93 ****
  		AnalysisCriterion buyAndHold = new VersusBuyAndHoldCriterion(new NumberOfTicksCriterion());
  		
! 		assertEquals(5d/6d, buyAndHold.calculate(series, trades));
  	}
  	
--- 89,93 ----
  		AnalysisCriterion buyAndHold = new VersusBuyAndHoldCriterion(new NumberOfTicksCriterion());
  		
! 		assertEquals(6d/6d, buyAndHold.calculate(series, trades));
  	}
  	

Index: AverageProfitCriterionTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/criteria/AverageProfitCriterionTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** AverageProfitCriterionTest.java	3 Oct 2007 18:57:45 -0000	1.11
--- AverageProfitCriterionTest.java	17 Oct 2007 22:31:15 -0000	1.12
***************
*** 73,77 ****
  		trades.add(new Trade(new Operation(2, OperationType.BUY), new Operation(5, OperationType.SELL)));
  		AnalysisCriterion averageProfit = new AverageProfitCriterion();
! 		assertEquals(Math.pow(95d/100 * 70d/100, 1d / 5), averageProfit.calculate(series, trades), 0.01);
  	}
  
--- 73,77 ----
  		trades.add(new Trade(new Operation(2, OperationType.BUY), new Operation(5, OperationType.SELL)));
  		AnalysisCriterion averageProfit = new AverageProfitCriterion();
! 		assertEquals(Math.pow(95d/100 * 70d/100, 1d / 6), averageProfit.calculate(series, trades), 0.01);
  	}