Update of /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/criteria In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2438/src/java/net/sf/tail/analysis/criteria Modified Files: BuyAndHoldCriterion.java MaximumDrawDownCriterion.java NumberOfTradesCriterion.java VersusBuyAndHoldCriterion.java NumberOfTicksCriterion.java BrazilianRewardRiskRatioCriterion.java AverageProfitCriterion.java RewardRiskRatioCriterion.java BrazilianTotalProfitCriterion.java TotalProfitCriterion.java BrazilianTransactionCostsCriterion.java Log Message: método getName adicionado nos criterias Index: MaximumDrawDownCriterion.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/criteria/MaximumDrawDownCriterion.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** MaximumDrawDownCriterion.java 4 Sep 2007 13:09:14 -0000 1.20 --- MaximumDrawDownCriterion.java 29 Oct 2007 21:40:17 -0000 1.21 *************** *** 49,52 **** --- 49,56 ---- } + public String getName() { + return "Maximum Draw Down"; + } + @Override public int hashCode() { Index: BrazilianTransactionCostsCriterion.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/criteria/BrazilianTransactionCostsCriterion.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BrazilianTransactionCostsCriterion.java 8 Oct 2007 19:19:05 -0000 1.1 --- BrazilianTransactionCostsCriterion.java 29 Oct 2007 21:40:19 -0000 1.2 *************** *** 28,31 **** --- 28,35 ---- } + public String getName() { + return "Brazilian Transaction Costs"; + } + @Override public int hashCode() { Index: RewardRiskRatioCriterion.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/criteria/RewardRiskRatioCriterion.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** RewardRiskRatioCriterion.java 4 Sep 2007 13:09:14 -0000 1.14 --- RewardRiskRatioCriterion.java 29 Oct 2007 21:40:18 -0000 1.15 *************** *** 35,38 **** --- 35,42 ---- } + public String getName() { + return "Reward Risk Ratio"; + } + @Override public int hashCode() { Index: TotalProfitCriterion.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/criteria/TotalProfitCriterion.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** TotalProfitCriterion.java 8 Oct 2007 19:19:05 -0000 1.17 --- TotalProfitCriterion.java 29 Oct 2007 21:40:19 -0000 1.18 *************** *** 47,50 **** --- 47,54 ---- } + + public String getName() { + return "Total Profit"; + } @Override Index: NumberOfTradesCriterion.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/criteria/NumberOfTradesCriterion.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** NumberOfTradesCriterion.java 22 Oct 2007 17:19:45 -0000 1.7 --- NumberOfTradesCriterion.java 29 Oct 2007 21:40:17 -0000 1.8 *************** *** 28,31 **** --- 28,35 ---- } + + public String getName() { + return "Number of Trades"; + } @Override Index: NumberOfTicksCriterion.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/criteria/NumberOfTicksCriterion.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** NumberOfTicksCriterion.java 17 Oct 2007 21:11:48 -0000 1.8 --- NumberOfTicksCriterion.java 29 Oct 2007 21:40:17 -0000 1.9 *************** *** 39,42 **** --- 39,46 ---- } + public String getName() { + return "Number of Ticks"; + } + @Override public int hashCode() { Index: BrazilianTotalProfitCriterion.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/criteria/BrazilianTotalProfitCriterion.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BrazilianTotalProfitCriterion.java 8 Oct 2007 19:19:05 -0000 1.1 --- BrazilianTotalProfitCriterion.java 29 Oct 2007 21:40:19 -0000 1.2 *************** *** 47,50 **** --- 47,54 ---- } + public String getName() { + return "Brazilian Total Profit"; + } + @Override public int hashCode() { Index: BuyAndHoldCriterion.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/criteria/BuyAndHoldCriterion.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** BuyAndHoldCriterion.java 3 Oct 2007 18:57:44 -0000 1.7 --- BuyAndHoldCriterion.java 29 Oct 2007 21:40:17 -0000 1.8 *************** *** 27,30 **** --- 27,34 ---- } + + public String getName() { + return "Buy and Hold"; + } @Override Index: VersusBuyAndHoldCriterion.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/criteria/VersusBuyAndHoldCriterion.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** VersusBuyAndHoldCriterion.java 3 Oct 2007 18:57:44 -0000 1.7 --- VersusBuyAndHoldCriterion.java 29 Oct 2007 21:40:17 -0000 1.8 *************** *** 41,44 **** --- 41,48 ---- } + + public String getName() { + return "Buy and hold versus " + criterion.getName(); + } @Override Index: BrazilianRewardRiskRatioCriterion.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/criteria/BrazilianRewardRiskRatioCriterion.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BrazilianRewardRiskRatioCriterion.java 29 Oct 2007 21:22:31 -0000 1.1 --- BrazilianRewardRiskRatioCriterion.java 29 Oct 2007 21:40:18 -0000 1.2 *************** *** 35,38 **** --- 35,41 ---- } + public String getName() { + return "Brazilian Reward Risk"; + } @Override public int hashCode() { *************** *** 53,57 **** return true; } - } --- 56,59 ---- Index: AverageProfitCriterion.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/criteria/AverageProfitCriterion.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** AverageProfitCriterion.java 4 Sep 2007 13:09:14 -0000 1.12 --- AverageProfitCriterion.java 29 Oct 2007 21:40:18 -0000 1.13 *************** *** 35,38 **** --- 35,42 ---- } + + public String getName() { + return "Average Profit"; + } @Override *************** *** 54,58 **** return true; } - } --- 58,61 ---- |