tail-cvs

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

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

Modified Files:
	AverageProfitCriterionTest.java 
	RewardRiskRatioCriterionTest.java 
	TotalProfitCriterionTest.java 
	MaximumDrawDownCriterionTest.java 
Log Message:
Retirado o método isBetter

Index: TotalProfitCriterionTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/criteria/TotalProfitCriterionTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TotalProfitCriterionTest.java	26 Jul 2007 19:33:29 -0000	1.5
--- TotalProfitCriterionTest.java	26 Jul 2007 20:48:55 -0000	1.6
***************
*** 2,6 ****
  
  import static org.junit.Assert.assertEquals;
- import static org.junit.Assert.assertTrue;
  
  import java.util.ArrayList;
--- 2,5 ----
***************
*** 11,16 ****
  import net.sf.tail.OperationType;
  import net.sf.tail.Trade;
- import net.sf.tail.analysis.evaluator.Decision;
- import net.sf.tail.analysis.evaluator.DummyDecision;
  import net.sf.tail.sample.SampleTimeSeries;
  
--- 10,13 ----
***************
*** 60,83 ****
  		assertEquals(1d, profit.calculate(series, trades));
  	}
- 
- 	@Test
- 	public void testIsBetter(){
- 		AnalysisCriterion criterion = new TotalProfitCriterion();
- 		List<Decision> list1 = new ArrayList<Decision>();
- 		List<Decision> list2 = new ArrayList<Decision>();
- 		
- 		list1.add(new DummyDecision(1.3d));
- 		list1.add(new DummyDecision(1.5d));
- 		list1.add(new DummyDecision(1.3d));
- 		list1.add(new DummyDecision(1.3d));
- 		list1.add(new DummyDecision(1.3d));
  	
- 		list2.add(new DummyDecision(1.4d));
- 		list2.add(new DummyDecision(1.2d));
- 		list2.add(new DummyDecision(1.3d));
- 		list2.add(new DummyDecision(1.4d));
- 		list2.add(new DummyDecision(1.3d));
- 		
- 		assertTrue(criterion.isBetter(list1, list2));
- 	}
  }
--- 57,60 ----

Index: RewardRiskRatioCriterionTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/criteria/RewardRiskRatioCriterionTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** RewardRiskRatioCriterionTest.java	26 Jul 2007 19:33:29 -0000	1.8
--- RewardRiskRatioCriterionTest.java	26 Jul 2007 20:48:55 -0000	1.9
***************
*** 7,16 ****
  import java.util.List;
  
- import net.sf.tail.AnalysisCriterion;
  import net.sf.tail.Operation;
  import net.sf.tail.OperationType;
  import net.sf.tail.Trade;
- import net.sf.tail.analysis.evaluator.Decision;
- import net.sf.tail.analysis.evaluator.DummyDecision;
  import net.sf.tail.sample.SampleTimeSeries;
  
--- 7,13 ----
***************
*** 63,86 ****
  	}
  	
- 	@Test
- 	public void testIsBetter(){
- 		AnalysisCriterion criterion = new RewardRiskRatioCriterion();
- 		List<Decision> list1 = new ArrayList<Decision>();
- 		List<Decision> list2 = new ArrayList<Decision>();
- 		
- 		list1.add(new DummyDecision(5.1d));
- 		list1.add(new DummyDecision(6.2d));
- 		list1.add(new DummyDecision(7.3d));
- 		list1.add(new DummyDecision(8.4d));
- 		list1.add(new DummyDecision(11.5d));
  
- 		list2.add(new DummyDecision(7.0d));
- 		list2.add(new DummyDecision(4.1d));
- 		list2.add(new DummyDecision(6.2d));
- 		list2.add(new DummyDecision(8.3d));
- 		list2.add(new DummyDecision(10.4d));
- 		
- 		assertTrue(criterion.isBetter(list1, list2));
- 	}
  
  }
--- 60,64 ----

Index: MaximumDrawDownCriterionTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/criteria/MaximumDrawDownCriterionTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MaximumDrawDownCriterionTest.java	26 Jul 2007 19:33:29 -0000	1.5
--- MaximumDrawDownCriterionTest.java	26 Jul 2007 20:48:55 -0000	1.6
***************
*** 2,16 ****
  
  import static org.junit.Assert.assertEquals;
- import static org.junit.Assert.assertTrue;
  
  import java.util.ArrayList;
  import java.util.List;
  
- import net.sf.tail.AnalysisCriterion;
  import net.sf.tail.Operation;
  import net.sf.tail.OperationType;
  import net.sf.tail.Trade;
- import net.sf.tail.analysis.evaluator.Decision;
- import net.sf.tail.analysis.evaluator.DummyDecision;
  import net.sf.tail.sample.SampleTimeSeries;
  
--- 2,12 ----
***************
*** 73,96 ****
  		assertEquals(0.5d, mdd.calculate(series, trades));
  	}
! 
! 	@Test
! 	public void testIsBetter(){
! 		AnalysisCriterion criterion = new MaximumDrawDownCriterion();
! 		List<Decision> list1 = new ArrayList<Decision>();
! 		List<Decision> list2 = new ArrayList<Decision>();
! 		
! 		list1.add(new DummyDecision(5.1d));
! 		list1.add(new DummyDecision(6.2d));
! 		list1.add(new DummyDecision(7.3d));
! 		list1.add(new DummyDecision(8.4d));
! 		list1.add(new DummyDecision(9.5d));
! 
! 		list2.add(new DummyDecision(7.0d));
! 		list2.add(new DummyDecision(4.1d));
! 		list2.add(new DummyDecision(6.2d));
! 		list2.add(new DummyDecision(9.3d));
! 		list2.add(new DummyDecision(10.4d));
! 		
! 		assertTrue(criterion.isBetter(list1, list2));
! 	}
! }
--- 69,71 ----
  		assertEquals(0.5d, mdd.calculate(series, trades));
  	}
! }
\ No newline at end of file

Index: AverageProfitCriterionTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/criteria/AverageProfitCriterionTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AverageProfitCriterionTest.java	26 Jul 2007 19:33:29 -0000	1.5
--- AverageProfitCriterionTest.java	26 Jul 2007 20:48:55 -0000	1.6
***************
*** 2,6 ****
  
  import static org.junit.Assert.assertEquals;
- import static org.junit.Assert.assertTrue;
  
  import java.util.ArrayList;
--- 2,5 ----
***************
*** 11,16 ****
  import net.sf.tail.OperationType;
  import net.sf.tail.Trade;
- import net.sf.tail.analysis.evaluator.Decision;
- import net.sf.tail.analysis.evaluator.DummyDecision;
  import net.sf.tail.sample.SampleTimeSeries;
  
--- 10,13 ----
***************
*** 55,78 ****
  	}
  	
- 	@Test
- 	public void testIsBetter(){
- 		AnalysisCriterion criterion = new AverageProfitCriterion();
- 		List<Decision> list1 = new ArrayList<Decision>();
- 		List<Decision> list2 = new ArrayList<Decision>();
- 		
- 		list1.add(new DummyDecision(1.4d));
- 		list1.add(new DummyDecision(1.2d));
- 		list1.add(new DummyDecision(1.3d));
- 		list1.add(new DummyDecision(1.4d));
- 		list1.add(new DummyDecision(1.3d));
- 
- 		list2.add(new DummyDecision(1.3d));
- 		list2.add(new DummyDecision(1.3d));
- 		list2.add(new DummyDecision(1.3d));
- 		list2.add(new DummyDecision(1.3d));
- 		list2.add(new DummyDecision(1.3d));
- 		
- 		assertTrue(criterion.isBetter(list1, list2));
- 	}
- 
  }
--- 52,54 ----