Menu
▾
▴
tail-cvs — cvs commits
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(148) |
Jun
(48) |
Jul
(107) |
Aug
(292) |
Sep
(301) |
Oct
(530) |
Nov
(142) |
Dec
(37) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
|
Feb
|
Mar
(4) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Carlos <ma...@us...> - 2007-10-29 22:11:52
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/i18n In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15923/src/java/net/sf/tails/i18n Modified Files: Messages.properties Log Message: Atualizado nomes de criterios na tela. Index: Messages.properties =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/i18n/Messages.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Messages.properties 29 Oct 2007 17:22:47 -0000 1.5 --- Messages.properties 29 Oct 2007 22:11:53 -0000 1.6 *************** *** 21,23 **** --- 21,24 ---- NEGATIVE_SLICESNUMBER_FIELD =Number of Slices field must be greater than zero. REPORT_HTML_ERROR =Exportation error, please restart the application. + INTERNAL_ERROR =An error has ocurred, please restart the application. EMPTY_REPORT_NAME =Please enter report name. \ No newline at end of file |
|
From: Carlos <ma...@us...> - 2007-10-29 22:11:47
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/criteria In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15912/src/java/net/sf/tail/analysis/criteria Modified Files: VersusBuyAndHoldCriterion.java Log Message: Atualizado nomes de criterios na tela. Index: VersusBuyAndHoldCriterion.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/criteria/VersusBuyAndHoldCriterion.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** VersusBuyAndHoldCriterion.java 29 Oct 2007 21:40:17 -0000 1.8 --- VersusBuyAndHoldCriterion.java 29 Oct 2007 22:11:48 -0000 1.9 *************** *** 43,47 **** public String getName() { ! return "Buy and hold versus " + criterion.getName(); } --- 43,47 ---- public String getName() { ! return "Buy and Hold versus " + criterion.getName(); } |
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 ---- |
|
From: Thies <tg...@us...> - 2007-10-29 21:40:26
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2438/src/java/net/sf/tail Modified Files: AnalysisCriterion.java Log Message: método getName adicionado nos criterias Index: AnalysisCriterion.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/AnalysisCriterion.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** AnalysisCriterion.java 4 Sep 2007 13:09:15 -0000 1.9 --- AnalysisCriterion.java 29 Oct 2007 21:40:19 -0000 1.10 *************** *** 13,15 **** --- 13,17 ---- double summarize(TimeSeries series, List<Decision> decisions); + String getName(); + } |
|
From: Thies <tg...@us...> - 2007-10-29 21:24:55
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28307/src/java/net/sf/tails/swing/frame/stockAnalysis Modified Files: NewStockAnalysis2.java Log Message: Acertando os imports Index: NewStockAnalysis2.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis2.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** NewStockAnalysis2.java 29 Oct 2007 21:07:06 -0000 1.12 --- NewStockAnalysis2.java 29 Oct 2007 21:24:58 -0000 1.13 *************** *** 9,13 **** import java.awt.Component; import java.awt.Dimension; - import java.awt.Font; import java.awt.GridLayout; import java.awt.Insets; --- 9,12 ---- |
|
From: Thies <tg...@us...> - 2007-10-29 21:22:49
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/i18n In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27485/src/java/net/sf/tails/i18n Modified Files: Classes.properties Log Message: Novo criteria Index: Classes.properties =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/i18n/Classes.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Classes.properties 15 Oct 2007 16:14:24 -0000 1.3 --- Classes.properties 29 Oct 2007 21:22:49 -0000 1.4 *************** *** 1,3 **** ! ANALYSIS_CRITERIA =AverageProfitCriterion;BuyAndHoldCriterion;MaximumDrawDownCriterion;NumberOfTicksCriterion;NumberOfTradesCriterion;RewardRiskRatioCriterion;TotalProfitCriterion;BrazilianTotalProfitCriterion;BrazilianTransactionCostsCriterion GENERIC_CRITERIA =VersusBuyAndHoldCriterion DEFAULT_CRITERIA =TotalProfitCriterion --- 1,3 ---- ! ANALYSIS_CRITERIA =AverageProfitCriterion;BuyAndHoldCriterion;MaximumDrawDownCriterion;NumberOfTicksCriterion;NumberOfTradesCriterion;RewardRiskRatioCriterion;TotalProfitCriterion;BrazilianTotalProfitCriterion;BrazilianTransactionCostsCriterion;BrazilianRewardRiskRatioCriterion GENERIC_CRITERIA =VersusBuyAndHoldCriterion DEFAULT_CRITERIA =TotalProfitCriterion |
|
From: Thies <tg...@us...> - 2007-10-29 21:22:40
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/criteria In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27460/src/java/net/sf/tail/analysis/criteria Added Files: BrazilianRewardRiskRatioCriterion.java Log Message: Novo criteria --- NEW FILE: BrazilianRewardRiskRatioCriterion.java --- package net.sf.tail.analysis.criteria; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import net.sf.tail.AnalysisCriterion; import net.sf.tail.TimeSeries; import net.sf.tail.Trade; import net.sf.tail.analysis.evaluator.Decision; public class BrazilianRewardRiskRatioCriterion implements AnalysisCriterion { private AnalysisCriterion totalProfit = new BrazilianTotalProfitCriterion(); private MaximumDrawDownCriterion maxDrawnDown = new MaximumDrawDownCriterion(); public double calculate(TimeSeries series, List<Trade> trades) { return totalProfit.calculate(series, trades) / maxDrawnDown.calculate(series, trades); } public double summarize(TimeSeries series, List<Decision> decisions) { List<Trade> trades = new LinkedList<Trade>(); for (Decision decision : decisions) { trades.addAll(decision.getTrades()); } return calculate(series, trades); } public double calculate(TimeSeries series, Trade trade) { List<Trade> trades = new ArrayList<Trade>(); trades.add(trade); return calculate(series, trades); } @Override public int hashCode() { final int prime = 31; int result = 1; result = prime * result + (this.getClass().hashCode()); return result; } @Override public boolean equals(Object obj) { if (this == obj) return true; if (obj == null) return false; if (getClass() != obj.getClass()) return false; return true; } } |
|
From: Thies <tg...@us...> - 2007-10-29 21:22:40
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/criteria In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27460/src/test/net/sf/tail/analysis/criteria Added Files: BrazilianRewardRiskRatioCriterionTest.java Log Message: Novo criteria --- NEW FILE: BrazilianRewardRiskRatioCriterionTest.java --- package net.sf.tail.analysis.criteria; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; 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; import org.junit.Before; import org.junit.Test; public class BrazilianRewardRiskRatioCriterionTest { private BrazilianRewardRiskRatioCriterion rrc; @Before public void setUp() { this.rrc = new BrazilianRewardRiskRatioCriterion(); } @Test public void testRewardRiskRatioCriterion() { List<Trade> trades = new ArrayList<Trade>(); trades.add(new Trade(new Operation(0, OperationType.BUY), new Operation(1, OperationType.SELL))); trades.add(new Trade(new Operation(2, OperationType.BUY), new Operation(4, OperationType.SELL))); trades.add(new Trade(new Operation(5, OperationType.BUY), new Operation(7, OperationType.SELL))); SampleTimeSeries series = new SampleTimeSeries(new double[] { 100, 105, 95, 100, 90, 95, 80, 120 }); double totalProfit = ((105d * 0.99965d)/ (100d * 1.00035d)) * ((90d * 0.99965d)/ (95d * 1.00035d)) * ((120d * 0.99965d) / (95 * 1.00035d)); double peak = (105d / 100) * (100d / 95); double low = (105d / 100) * (90d / 95) * (80d / 95); assertEquals(totalProfit / ((peak - low) / peak), rrc.calculate(series, trades), 0.001); } @Test public void testSummarize() { SampleTimeSeries series = new SampleTimeSeries(new double[] { 100, 105, 95, 100, 90, 95, 80, 120 }); List<Decision> decisions = new LinkedList<Decision>(); List<Trade> tradesToDummy1 = new LinkedList<Trade>(); tradesToDummy1.add(new Trade(new Operation(0, OperationType.BUY), new Operation(1, OperationType.SELL))); Decision dummy1 = new DummyDecision(tradesToDummy1); decisions.add(dummy1); List<Trade> tradesToDummy2 = new LinkedList<Trade>(); tradesToDummy2.add(new Trade(new Operation(2, OperationType.BUY), new Operation(4, OperationType.SELL))); Decision dummy2 = new DummyDecision(tradesToDummy2); decisions.add(dummy2); List<Trade> tradesToDummy3 = new LinkedList<Trade>(); tradesToDummy3.add(new Trade(new Operation(5, OperationType.BUY), new Operation(7, OperationType.SELL))); Decision dummy3 = new DummyDecision(tradesToDummy3); decisions.add(dummy3); double totalProfit = ((105d * 0.99965d)/ (100d * 1.00035d)) * ((90d * 0.99965d)/ (95d * 1.00035d)) * ((120d * 0.99965d) / (95 * 1.00035d)); double peak = (105d / 100) * (100d / 95); double low = (105d / 100) * (90d / 95) * (80d / 95); assertEquals(totalProfit / ((peak - low) / peak), rrc.summarize(series, decisions), 0.001); } @Test public void testRewardRiskRatioCriterionOnlyWithGain() { SampleTimeSeries series = new SampleTimeSeries(new double[] { 1, 2, 3, 6, 8, 20, 3 }); List<Trade> trades = new ArrayList<Trade>(); trades.add(new Trade(new Operation(0, OperationType.BUY), new Operation(1, OperationType.SELL))); trades.add(new Trade(new Operation(2, OperationType.BUY), new Operation(5, OperationType.SELL))); assertTrue(Double.isInfinite(rrc.calculate(series, trades))); } @Test public void testRewardRiskRatioCriterionWithNoTrades() { SampleTimeSeries series = new SampleTimeSeries(new double[] { 1, 2, 3, 6, 8, 20, 3 }); List<Trade> trades = new ArrayList<Trade>(); assertTrue(Double.isInfinite(rrc.calculate(series, trades))); } @Test public void testWithOneTrade() { Trade trade = new Trade(new Operation(0, OperationType.BUY), new Operation(1, OperationType.SELL)); SampleTimeSeries series = new SampleTimeSeries(new double[] { 100, 95, 95, 100, 90, 95, 80, 120 }); assertEquals(((95d* 0.99965d) /(100 * 1.00035d)) / ((1d - 0.95d)), rrc.calculate(series, trade)); } } |
|
From: Thies <tg...@us...> - 2007-10-29 21:13:21
|
Update of /cvsroot/tail/TailS/dsl In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23576/dsl Modified Files: rubyDSLutils.rb Log Message: Novo indicador para o ruby Index: rubyDSLutils.rb =================================================================== RCS file: /cvsroot/tail/TailS/dsl/rubyDSLutils.rb,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** rubyDSLutils.rb 10 Oct 2007 22:00:53 -0000 1.3 --- rubyDSLutils.rb 29 Oct 2007 21:13:23 -0000 1.4 *************** *** 91,94 **** --- 91,98 ---- end + def wma (timeFrame) + Tail::WMAIndicator.new($close, timeFrame) + end + def williamsR(timeFrame) Tail::WilliamsRIndicator.new($close, timeFrame) *************** *** 101,103 **** def pipeEnter(indicatorUpper, indicatorLower, indicatorValue) Tail::PipeEnterStrategy(indicatorUpper, indicatorLower, indicatorValue) ! end \ No newline at end of file --- 105,107 ---- def pipeEnter(indicatorUpper, indicatorLower, indicatorValue) Tail::PipeEnterStrategy(indicatorUpper, indicatorLower, indicatorValue) ! end |
|
From: Thies <tg...@us...> - 2007-10-29 21:13:04
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/i18n In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23312/src/java/net/sf/tails/i18n Modified Files: DSL_IDE.properties Log Message: Novo indicador para o ruby Index: DSL_IDE.properties =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/i18n/DSL_IDE.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DSL_IDE.properties 10 Oct 2007 22:00:50 -0000 1.3 --- DSL_IDE.properties 29 Oct 2007 21:13:03 -0000 1.4 *************** *** 1,4 **** RUBY_KEYWORDS= alias and begin break case catch class def do elsif else fail ensure for end if in module next not or raise redo rescue retry return then throw super unless undef until when while yield ! TAIL_INDICATORS_KEYWORDS= def averageGain(timeFrame) averageGain averageLoss(timeFrame) averageLoss max(indicator) min(indicator) averageDirectionalMovement(timeFrame) directionalMovement(timeFrame) onBalanceVolume standartDeviation(indicator,timeFrame) ema(timeFrame) parabolicSAR rsi(timeFrame) close amount maxPrice minPrice openPrice volume sma(timeFrame) williamsR(timeFrame) TAIL_STRATEGIES_KEYWORDS= cross(indicator1,indicator2) pipeEnter(indicatorUpper,indicatorLower,indicatorValue) \ No newline at end of file --- 1,4 ---- RUBY_KEYWORDS= alias and begin break case catch class def do elsif else fail ensure for end if in module next not or raise redo rescue retry return then throw super unless undef until when while yield ! TAIL_INDICATORS_KEYWORDS= def averageGain(timeFrame) averageGain averageLoss(timeFrame) averageLoss max(indicator) min(indicator) averageDirectionalMovement(timeFrame) directionalMovement(timeFrame) onBalanceVolume standartDeviation(indicator,timeFrame) ema(timeFrame) parabolicSAR rsi(timeFrame) close amount maxPrice minPrice openPrice volume sma(timeFrame) williamsR(timeFrame) wma(timeFrame) TAIL_STRATEGIES_KEYWORDS= cross(indicator1,indicator2) pipeEnter(indicatorUpper,indicatorLower,indicatorValue) \ No newline at end of file |
|
From: Thies <tg...@us...> - 2007-10-29 21:11:33
|
Update of /cvsroot/tail/Tail/dsl In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22736/dsl Modified Files: rubyDSLutils.rb Log Message: Novo indicador para o ruby Index: rubyDSLutils.rb =================================================================== RCS file: /cvsroot/tail/Tail/dsl/rubyDSLutils.rb,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** rubyDSLutils.rb 10 Oct 2007 21:59:54 -0000 1.7 --- rubyDSLutils.rb 29 Oct 2007 21:11:35 -0000 1.8 *************** *** 91,94 **** --- 91,98 ---- end + def wma (timeFrame) + Tail::WMAIndicator.new($close, timeFrame) + end + def williamsR(timeFrame) Tail::WilliamsRIndicator.new($close, timeFrame) *************** *** 101,103 **** def pipeEnter(indicatorUpper, indicatorLower, indicatorValue) Tail::PipeEnterStrategy(indicatorUpper, indicatorLower, indicatorValue) ! end \ No newline at end of file --- 105,107 ---- def pipeEnter(indicatorUpper, indicatorLower, indicatorValue) Tail::PipeEnterStrategy(indicatorUpper, indicatorLower, indicatorValue) ! end |
|
From: Thies <tg...@us...> - 2007-10-29 21:11:09
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/graphics In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22656/src/java/net/sf/tail/graphics Modified Files: CriteriaDataset.java FasterCriteriaDataset.java Log Message: refatoração Index: CriteriaDataset.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/graphics/CriteriaDataset.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CriteriaDataset.java 22 Oct 2007 22:36:31 -0000 1.3 --- CriteriaDataset.java 29 Oct 2007 21:11:10 -0000 1.4 *************** *** 3,7 **** --- 3,9 ---- import java.util.List; + import net.sf.tail.AnalysisCriterion; import net.sf.tail.TimeSeries; + import net.sf.tail.analysis.criteria.TotalProfitCriterion; import net.sf.tail.report.Report; *************** *** 26,29 **** --- 28,33 ---- private TimeSeries series; + + private final AnalysisCriterion totalProfit; public CriteriaDataset(List<Report> reports, TimeSeries series, int datasetSize) { *************** *** 34,37 **** --- 38,42 ---- this.firstIndex = series.getBegin(); this.lastIndex = series.getBegin() + DATASET_SIZE - 1; + this.totalProfit = new TotalProfitCriterion(); loadValues(firstIndex, lastIndex); *************** *** 42,46 **** for (int i = 0; i < reports.size(); i++) { for (int j = firstIndex; j <= lastIndex; j++) { ! data.addValue(reports.get(i).getApplyedCriterion().calculate(series, reports.get(i).getTradesUntilIndex(j)), reports.get(i).getName(), series.getTick(j).getDate() .toString("hh:mm d/M/yyyy")); } --- 47,51 ---- for (int i = 0; i < reports.size(); i++) { for (int j = firstIndex; j <= lastIndex; j++) { ! data.addValue(totalProfit.calculate(series, reports.get(i).getTradesUntilIndex(j)), reports.get(i).getName(), series.getTick(j).getDate() .toString("hh:mm d/M/yyyy")); } *************** *** 101,105 **** lastIndex ++; for (Report report : reports) { ! data.addValue(report.getApplyedCriterion().calculate(series, report.getTradesUntilIndex(lastIndex)), report.getName(), series.getTick(lastIndex).getDate() .toString("hh:mm d/M/yyyy")); } --- 106,110 ---- lastIndex ++; for (Report report : reports) { ! data.addValue(totalProfit.calculate(series, report.getTradesUntilIndex(lastIndex)), report.getName(), series.getTick(lastIndex).getDate() .toString("hh:mm d/M/yyyy")); } Index: FasterCriteriaDataset.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/graphics/FasterCriteriaDataset.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FasterCriteriaDataset.java 24 Oct 2007 23:35:38 -0000 1.2 --- FasterCriteriaDataset.java 29 Oct 2007 21:11:10 -0000 1.3 *************** *** 4,8 **** --- 4,10 ---- import java.util.List; + import net.sf.tail.AnalysisCriterion; import net.sf.tail.TimeSeries; + import net.sf.tail.analysis.criteria.TotalProfitCriterion; import net.sf.tail.report.Report; *************** *** 21,24 **** --- 23,28 ---- private TimeSeries series; + + private final AnalysisCriterion totalProfit; public FasterCriteriaDataset(TimeSeries series, List<Report> reports) { *************** *** 26,29 **** --- 30,34 ---- this.reports = reports; this.series = series; + this.totalProfit = new TotalProfitCriterion(); if(series.getSize() > 800) *************** *** 37,41 **** for (Report report : reports) { for (int j = firstIndex; j <= lastIndex; j++) { ! data.addValue(report.getApplyedCriterion().calculate(series, report.getTradesUntilIndex(j)), report.getName() + ": "+ series.getTick(series.getBegin()).getDateName() + " - " + series.getTick(series.getEnd()).getDateName(), series.getTick(j).getDate() .toString("hh:mm d/M/yyyy")); } --- 42,46 ---- for (Report report : reports) { for (int j = firstIndex; j <= lastIndex; j++) { ! data.addValue(totalProfit.calculate(series, report.getTradesUntilIndex(j)), report.getName() + ": "+ series.getTick(series.getBegin()).getDateName() + " - " + series.getTick(series.getEnd()).getDateName(), series.getTick(j).getDate() .toString("hh:mm d/M/yyyy")); } *************** *** 51,55 **** for (Report report : reports){ for (j = firstIndex; j <= firstIndex + 2; j++) { ! data.addValue(report.getApplyedCriterion().calculate(series, report.getTradesUntilIndex(j)), report.getName() , series.getTick(j).getDate() .toString("hh:mm d/M/yyyy")); } --- 56,60 ---- for (Report report : reports){ for (j = firstIndex; j <= firstIndex + 2; j++) { ! data.addValue(totalProfit.calculate(series, report.getTradesUntilIndex(j)), report.getName() , series.getTick(j).getDate() .toString("hh:mm d/M/yyyy")); } *************** *** 58,64 **** for (j = firstIndex + 3; j < lastIndex; j++) { for (Report report : reports) { ! firstValue = report.getApplyedCriterion().calculate(series, report.getTradesUntilIndex(j - 2)); ! secondValue = report.getApplyedCriterion().calculate(series, report.getTradesUntilIndex(j - 1));; ! thirdValue = report.getApplyedCriterion().calculate(series, report.getTradesUntilIndex(j));; if((firstValue > secondValue && thirdValue > secondValue) || (firstValue < secondValue && thirdValue < secondValue) || counter > 10){ drawPoint = true; --- 63,69 ---- for (j = firstIndex + 3; j < lastIndex; j++) { for (Report report : reports) { ! firstValue = totalProfit.calculate(series, report.getTradesUntilIndex(j - 2)); ! secondValue = totalProfit.calculate(series, report.getTradesUntilIndex(j - 1));; ! thirdValue = totalProfit.calculate(series, report.getTradesUntilIndex(j));; if((firstValue > secondValue && thirdValue > secondValue) || (firstValue < secondValue && thirdValue < secondValue) || counter > 10){ drawPoint = true; *************** *** 69,73 **** if(drawPoint) { for (Report report : reports) { ! data.addValue(report.getApplyedCriterion().calculate(series, report.getTradesUntilIndex(j - 1)), report.getName(), series.getTick(j-1).getDate() .toString("hh:mm d/M/yyyy")); } --- 74,78 ---- if(drawPoint) { for (Report report : reports) { ! data.addValue(totalProfit.calculate(series, report.getTradesUntilIndex(j - 1)), report.getName(), series.getTick(j-1).getDate() .toString("hh:mm d/M/yyyy")); } *************** *** 78,82 **** for (Report report : reports) { ! data.addValue(report.getApplyedCriterion().calculate(series, report.getTradesUntilIndex(lastIndex)), report.getName(), series.getTick(lastIndex).getDate() .toString("hh:mm d/M/yyyy")); } --- 83,87 ---- for (Report report : reports) { ! data.addValue(totalProfit.calculate(series, report.getTradesUntilIndex(lastIndex)), report.getName(), series.getTick(lastIndex).getDate() .toString("hh:mm d/M/yyyy")); } |
|
From: Carlos <ma...@us...> - 2007-10-29 21:07:06
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20741/src/java/net/sf/tails/swing/frame/stockAnalysis Modified Files: NewStockAnalysis2.java NewStockAnalysis3.java Log Message: Ajustes de fonte. Index: NewStockAnalysis2.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis2.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** NewStockAnalysis2.java 29 Oct 2007 18:22:23 -0000 1.11 --- NewStockAnalysis2.java 29 Oct 2007 21:07:06 -0000 1.12 *************** *** 130,134 **** for (String criteriaName : genericCriteria) { JPanel genericCriterionPanel = new JPanel(); ! genericCriterionPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), criteriaName, TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, new Font("Dialog", 0, 12))); genericCriterionPanel.setLayout(new GridLayout(0, 3, 15, 15)); genericCriterionPanel.setMaximumSize(new Dimension(400, 0)); --- 130,134 ---- for (String criteriaName : genericCriteria) { JPanel genericCriterionPanel = new JPanel(); ! genericCriterionPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), criteriaName, TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION)); genericCriterionPanel.setLayout(new GridLayout(0, 3, 15, 15)); genericCriterionPanel.setMaximumSize(new Dimension(400, 0)); Index: NewStockAnalysis3.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis3.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** NewStockAnalysis3.java 29 Oct 2007 16:48:35 -0000 1.11 --- NewStockAnalysis3.java 29 Oct 2007 21:07:06 -0000 1.12 *************** *** 125,129 **** startDateField.setText(date.getDayOfMonth() + "/" + date.getMonthOfYear() + "/" + date.getYear()); ! slicesPeriodPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "Slices Period", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, new Font("Dialog", 0, 14))); yearsLabel.setFont(new Font("Dialog", 1, 10)); yearsLabel.setText("Years:"); --- 125,129 ---- startDateField.setText(date.getDayOfMonth() + "/" + date.getMonthOfYear() + "/" + date.getYear()); ! slicesPeriodPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "Slices Period", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION)); yearsLabel.setFont(new Font("Dialog", 1, 10)); yearsLabel.setText("Years:"); *************** *** 214,218 **** runnerTypeLabel.setText("Runner Type:"); ! runnerTypeComboBox.setModel(new DefaultComboBoxModel(new String[]{ "HystoryRunner", "ShortSellRunner" })); runnerTypeComboBox.setMinimumSize(new Dimension(178, 23)); runnerTypeComboBox.setPreferredSize(new Dimension(178, 23)); --- 214,218 ---- runnerTypeLabel.setText("Runner Type:"); ! runnerTypeComboBox.setModel(new DefaultComboBoxModel(new String[]{ "HistoryRunner", "ShortSellRunner" })); runnerTypeComboBox.setMinimumSize(new Dimension(178, 23)); runnerTypeComboBox.setPreferredSize(new Dimension(178, 23)); |
|
From: Carlos <ma...@us...> - 2007-10-29 18:47:19
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25640/src/java/net/sf/tails/swing/frame Modified Files: Index.java Log Message: sem location by platform. Index: Index.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/Index.java,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** Index.java 29 Oct 2007 18:39:56 -0000 1.42 --- Index.java 29 Oct 2007 18:47:22 -0000 1.43 *************** *** 147,151 **** initComponents(); this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - this.setLocationByPlatform(true); this.setTitle(messageBundle.getString("DEFAULT_TITLE")); this.setSize(Toolkit.getDefaultToolkit().getScreenSize()); --- 147,150 ---- |
|
From: Carlos <ma...@us...> - 2007-10-29 18:39:53
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22268/src/java/net/sf/tails/swing/frame/report Modified Files: NewReportFrame.java Log Message: Mais ajustes de nome de arquivo e de fullscreen. Index: NewReportFrame.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report/NewReportFrame.java,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** NewReportFrame.java 29 Oct 2007 18:28:56 -0000 1.30 --- NewReportFrame.java 29 Oct 2007 18:39:56 -0000 1.31 *************** *** 388,392 **** // TODO: Acertas os parametros assim que a tela for finalizada stockAnalysis.addReport(reportNameField.getText(), strategies); ! index.loadStockAnalysis(stockAnalysis); index.appendConsoleArea("Report " + reportNameField.getText() + " added succesfully."); this.dispose(); --- 388,392 ---- // TODO: Acertas os parametros assim que a tela for finalizada stockAnalysis.addReport(reportNameField.getText(), strategies); ! index.loadReport(stockAnalysis); index.appendConsoleArea("Report " + reportNameField.getText() + " added succesfully."); this.dispose(); *************** *** 414,418 **** strategies = dsl.evalStrategies(customStrategyTextArea.getText()); stockAnalysis.addReport(reportNameField.getText(), strategies); ! index.loadStockAnalysis(stockAnalysis); index.appendConsoleArea("Report " + reportNameField.getText() + " added succesfully."); this.dispose(); --- 414,418 ---- strategies = dsl.evalStrategies(customStrategyTextArea.getText()); stockAnalysis.addReport(reportNameField.getText(), strategies); ! index.loadReport(stockAnalysis); index.appendConsoleArea("Report " + reportNameField.getText() + " added succesfully."); this.dispose(); |
|
From: Carlos <ma...@us...> - 2007-10-29 18:39:53
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22268/src/java/net/sf/tails/swing/frame Modified Files: Index.java Log Message: Mais ajustes de nome de arquivo e de fullscreen. Index: Index.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/Index.java,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** Index.java 29 Oct 2007 17:12:29 -0000 1.41 --- Index.java 29 Oct 2007 18:39:56 -0000 1.42 *************** *** 840,843 **** --- 840,844 ---- StockAnalysis analysis = serializer.fromXML(stringAnalysis); loadStockAnalysis(analysis); + this.setTitle(directoryFileChooser.getSelectedFile().getName() + " - " + messageBundle.getString("DEFAULT_TITLE")); this.appendConsoleArea("Stock Analysis " + directoryFileChooser.getSelectedFile().getName() + " loaded succesfully."); *************** *** 887,890 **** --- 888,892 ---- public void loadStockAnalysis(StockAnalysis analysis) { + this.setTitle(messageBundle.getString("DEFAULT_TITLE")); informationTextArea.setText(helper.getInfo(analysis)); *************** *** 938,942 **** this.stockAnalysis = analysis; - this.pack(); } --- 940,943 ---- |
|
From: Carlos <ma...@us...> - 2007-10-29 18:28:56
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17452/src/java/net/sf/tails/swing/frame/report Modified Files: NewReportFrame.java Log Message: Ajustando mais detalhes. Index: NewReportFrame.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report/NewReportFrame.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** NewReportFrame.java 29 Oct 2007 18:24:11 -0000 1.29 --- NewReportFrame.java 29 Oct 2007 18:28:56 -0000 1.30 *************** *** 179,183 **** radioButtonSMA.setToolTipText(indicatorBundle.getString("SMAIndicator")); radioButtonSMA.setText("SMA"); - radioButtonSMA.setMargin(new Insets(0, 0, 0, 0)); radioButtonSMA.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { --- 179,182 ---- *************** *** 188,192 **** radioButtonEMA.setToolTipText(indicatorBundle.getString("EMAIndicator")); radioButtonEMA.setText("EMA"); - radioButtonEMA.setMargin(new Insets(0, 0, 0, 0)); radioButtonEMA.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { --- 187,190 ---- *************** *** 197,201 **** radioButtonRSI.setToolTipText(indicatorBundle.getString("RSIIndicator")); radioButtonRSI.setText("RSI"); - radioButtonRSI.setMargin(new Insets(0, 0, 0, 0)); radioButtonRSI.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { --- 195,198 ---- *************** *** 206,210 **** radioButtonBollingerBands.setToolTipText(indicatorBundle.getString("BollingerBandsIndicator")); radioButtonBollingerBands.setText("Bollinger Bands"); - radioButtonBollingerBands.setMargin(new Insets(0, 0, 0, 0)); radioButtonBollingerBands.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { --- 203,206 ---- *************** *** 215,219 **** radioButtonParabolicSAR.setToolTipText(indicatorBundle.getString("ParabolicSarIndicator")); radioButtonParabolicSAR.setText("Parabolic SAR"); - radioButtonParabolicSAR.setMargin(new Insets(0, 0, 0, 0)); radioButtonParabolicSAR.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { --- 211,214 ---- *************** *** 224,228 **** radioButtonWMA.setToolTipText(indicatorBundle.getString("WMAIndicator")); radioButtonWMA.setText("WMA"); - radioButtonWMA.setMargin(new Insets(0, 0, 0, 0)); radioButtonWMA.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { --- 219,222 ---- *************** *** 238,242 **** radioGroupPanel.setMaximumSize(new Dimension(750, 100)); radioGroupPanel.setMinimumSize(new Dimension(750, 100)); ! radioGroupPanel.setLayout(new GridLayout(0, 2, 15, 15)); radioGroupPanel.add(radioButtonSMA); radioGroupPanel.add(radioButtonEMA); --- 232,236 ---- radioGroupPanel.setMaximumSize(new Dimension(750, 100)); radioGroupPanel.setMinimumSize(new Dimension(750, 100)); ! radioGroupPanel.setLayout(new GridLayout(0, 2, 0, 0)); radioGroupPanel.add(radioButtonSMA); radioGroupPanel.add(radioButtonEMA); |
|
From: Thies <tg...@us...> - 2007-10-29 18:24:08
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15676/src/java/net/sf/tails/swing/frame/report Modified Files: NewReportFrame.java Log Message: Acertando o codigo Index: NewReportFrame.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report/NewReportFrame.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** NewReportFrame.java 29 Oct 2007 18:22:23 -0000 1.28 --- NewReportFrame.java 29 Oct 2007 18:24:11 -0000 1.29 *************** *** 391,395 **** else { DefaultStrategiesGenerator defaulStrategies = new DefaultStrategiesGenerator(); ! Set<Strategy> strategies = defaulStrategies.generate(stockAnalysis.getStock(), selectedEnum, 4, 60); // TODO: Acertas os parametros assim que a tela for finalizada stockAnalysis.addReport(reportNameField.getText(), strategies); --- 391,395 ---- else { DefaultStrategiesGenerator defaulStrategies = new DefaultStrategiesGenerator(); ! Set<Strategy> strategies = defaulStrategies.generate(stockAnalysis.getStock(), selectedEnum, 4, 60, notSoFastCheckBox.isSelected()); // TODO: Acertas os parametros assim que a tela for finalizada stockAnalysis.addReport(reportNameField.getText(), strategies); |
|
From: Carlos <ma...@us...> - 2007-10-29 18:22:21
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14847/src/java/net/sf/tails/swing/frame/report Modified Files: NewReportFrame.java Log Message: Ajustada tela de new report. Index: NewReportFrame.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report/NewReportFrame.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** NewReportFrame.java 29 Oct 2007 18:02:35 -0000 1.27 --- NewReportFrame.java 29 Oct 2007 18:22:23 -0000 1.28 *************** *** 3,6 **** --- 3,8 ---- import java.awt.Component; import java.awt.Dimension; + import java.awt.Font; + import java.awt.GridLayout; import java.awt.Insets; import java.awt.event.ActionEvent; *************** *** 17,20 **** --- 19,23 ---- import javax.script.ScriptException; + import javax.swing.BorderFactory; import javax.swing.ButtonGroup; import javax.swing.GroupLayout; *************** *** 78,82 **** private JCheckBox notSoFastCheckBox; private JScrollPane customStrategyPane; - private JScrollPane radioGroupScrollPane; private JTabbedPane newReportTabbedPane; private JEditTextArea customStrategyTextArea; --- 81,84 ---- *************** *** 108,112 **** createButtonDefaultPanel = new JButton(); cancelButtonDefaultPanel = new JButton(); - radioGroupScrollPane = new JScrollPane(); radioGroupPanel = new JPanel(); radioButtonSMA = new JRadioButton(); --- 110,113 ---- *************** *** 169,173 **** }); - radioGroupScrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); indicatorsButtonGroup.add(radioButtonSMA); indicatorsButtonGroup.add(radioButtonEMA); --- 170,173 ---- *************** *** 177,181 **** indicatorsButtonGroup.add(radioButtonWMA); ! radioButtonSMA.setText("SMA - " + indicatorBundle.getString("SMAIndicator")); radioButtonSMA.setMargin(new Insets(0, 0, 0, 0)); radioButtonSMA.addActionListener(new ActionListener() { --- 177,182 ---- indicatorsButtonGroup.add(radioButtonWMA); ! radioButtonSMA.setToolTipText(indicatorBundle.getString("SMAIndicator")); ! radioButtonSMA.setText("SMA"); radioButtonSMA.setMargin(new Insets(0, 0, 0, 0)); radioButtonSMA.addActionListener(new ActionListener() { *************** *** 185,189 **** }); ! radioButtonEMA.setText("EMA - " + indicatorBundle.getString("EMAIndicator")); radioButtonEMA.setMargin(new Insets(0, 0, 0, 0)); radioButtonEMA.addActionListener(new ActionListener() { --- 186,191 ---- }); ! radioButtonEMA.setToolTipText(indicatorBundle.getString("EMAIndicator")); ! radioButtonEMA.setText("EMA"); radioButtonEMA.setMargin(new Insets(0, 0, 0, 0)); radioButtonEMA.addActionListener(new ActionListener() { *************** *** 193,197 **** }); ! radioButtonRSI.setText("RSI - " + indicatorBundle.getString("RSIIndicator")); radioButtonRSI.setMargin(new Insets(0, 0, 0, 0)); radioButtonRSI.addActionListener(new ActionListener() { --- 195,200 ---- }); ! radioButtonRSI.setToolTipText(indicatorBundle.getString("RSIIndicator")); ! radioButtonRSI.setText("RSI"); radioButtonRSI.setMargin(new Insets(0, 0, 0, 0)); radioButtonRSI.addActionListener(new ActionListener() { *************** *** 201,205 **** }); ! radioButtonBollingerBands.setText("Bollinger Bands - " + indicatorBundle.getString("BollingerBandsIndicator")); radioButtonBollingerBands.setMargin(new Insets(0, 0, 0, 0)); radioButtonBollingerBands.addActionListener(new ActionListener() { --- 204,209 ---- }); ! radioButtonBollingerBands.setToolTipText(indicatorBundle.getString("BollingerBandsIndicator")); ! radioButtonBollingerBands.setText("Bollinger Bands"); radioButtonBollingerBands.setMargin(new Insets(0, 0, 0, 0)); radioButtonBollingerBands.addActionListener(new ActionListener() { *************** *** 209,213 **** }); ! radioButtonParabolicSAR.setText("Parabolic SAR - " + indicatorBundle.getString("ParabolicSarIndicator")); radioButtonParabolicSAR.setMargin(new Insets(0, 0, 0, 0)); radioButtonParabolicSAR.addActionListener(new ActionListener() { --- 213,218 ---- }); ! radioButtonParabolicSAR.setToolTipText(indicatorBundle.getString("ParabolicSarIndicator")); ! radioButtonParabolicSAR.setText("Parabolic SAR"); radioButtonParabolicSAR.setMargin(new Insets(0, 0, 0, 0)); radioButtonParabolicSAR.addActionListener(new ActionListener() { *************** *** 217,221 **** }); ! radioButtonWMA.setText("WMA - " + indicatorBundle.getString("WMAIndicator")); radioButtonWMA.setMargin(new Insets(0, 0, 0, 0)); radioButtonWMA.addActionListener(new ActionListener() { --- 222,227 ---- }); ! radioButtonWMA.setToolTipText(indicatorBundle.getString("WMAIndicator")); ! radioButtonWMA.setText("WMA"); radioButtonWMA.setMargin(new Insets(0, 0, 0, 0)); radioButtonWMA.addActionListener(new ActionListener() { *************** *** 225,305 **** }); ! notSoFastCheckBox.setText("Not So Fast Strategy"); notSoFastCheckBox.setMargin(new Insets(0, 0, 0, 0)); ! GroupLayout radioGroupPanelLayout = new GroupLayout(radioGroupPanel); ! radioGroupPanel.setLayout(radioGroupPanelLayout); ! radioGroupPanelLayout.setHorizontalGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(radioButtonSMA)) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(radioButtonEMA)) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(radioButtonRSI)) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(radioButtonBollingerBands)) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(radioButtonParabolicSAR)) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(radioButtonWMA)) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(notSoFastCheckBox)) ! .addGap(314, 314, 314)); ! radioGroupPanelLayout.setVerticalGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(radioGroupPanelLayout.createSequentialGroup() ! .addComponent(radioButtonSMA) ! .addGap(10, 10, 10) ! .addComponent(radioButtonEMA) ! .addGap(10,10, 10) ! .addComponent(radioButtonRSI) ! .addGap(10, 10, 10) ! .addComponent(radioButtonBollingerBands) ! .addGap(10, 10, 10) ! .addComponent(radioButtonParabolicSAR) ! .addGap(10, 10, 10) ! .addComponent(radioButtonWMA) ! .addGap(10, 10, 10) ! .addComponent(notSoFastCheckBox) ! .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, 82, ! Short.MAX_VALUE).addContainerGap())); ! radioGroupScrollPane.setViewportView(radioGroupPanel); GroupLayout defaultTabPanel = new GroupLayout(defaultReportPanel); defaultReportPanel.setLayout(defaultTabPanel); ! defaultTabPanel.setHorizontalGroup(defaultTabPanel.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup( ! defaultTabPanel.createSequentialGroup().addGap(12).addGroup( ! defaultTabPanel.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup( ! GroupLayout.Alignment.TRAILING, ! defaultTabPanel.createSequentialGroup().addComponent(cancelButtonDefaultPanel).addPreferredGap( ! LayoutStyle.ComponentPlacement.RELATED).addComponent(createButtonDefaultPanel)).addComponent( ! radioGroupScrollPane, GroupLayout.DEFAULT_SIZE, 385, Short.MAX_VALUE)).addContainerGap())); ! defaultTabPanel.linkSize(SwingConstants.HORIZONTAL, ! new Component[] { createButtonDefaultPanel, cancelButtonDefaultPanel }); ! defaultTabPanel.setVerticalGroup(defaultTabPanel.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup( ! GroupLayout.Alignment.TRAILING, ! defaultTabPanel.createSequentialGroup().addGap(12).addComponent(radioGroupScrollPane, GroupLayout.PREFERRED_SIZE, 251, ! GroupLayout.PREFERRED_SIZE).addGap(6).addGroup( ! defaultTabPanel.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(createButtonDefaultPanel) ! .addComponent(cancelButtonDefaultPanel)))); newReportTabbedPane.addTab("Default Report", defaultReportPanel); customStrategyTextArea.setTokenMarker(new TailSTokenMarker()); - // customStrategyTextArea.addKeyListener(new KeyListener() { - // @Override - // public void keyPressed(KeyEvent e) { - // textAreaTextChanged(e); - // } - // - // @Override - // public void keyReleased(KeyEvent e) { - // } - // - // @Override - // public void keyTyped(KeyEvent e) { - // } - // }); - customStrategyPane.setViewportView(customStrategyTextArea); customStrategyPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); --- 231,278 ---- }); ! notSoFastCheckBox.setText("No trades in less than 4 ticks."); ! notSoFastCheckBox.setToolTipText(indicatorBundle.getString("NotSoFastStrategy")); notSoFastCheckBox.setMargin(new Insets(0, 0, 0, 0)); ! radioGroupPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "Select Default Strategy", 0, 0, new Font("Dialog", 1, 12)))); ! radioGroupPanel.setMaximumSize(new Dimension(750, 100)); ! radioGroupPanel.setMinimumSize(new Dimension(750, 100)); ! radioGroupPanel.setLayout(new GridLayout(0, 2, 15, 15)); ! radioGroupPanel.add(radioButtonSMA); ! radioGroupPanel.add(radioButtonEMA); ! radioGroupPanel.add(radioButtonRSI); ! radioGroupPanel.add(radioButtonBollingerBands); ! radioGroupPanel.add(radioButtonParabolicSAR); ! radioGroupPanel.add(radioButtonWMA); GroupLayout defaultTabPanel = new GroupLayout(defaultReportPanel); defaultReportPanel.setLayout(defaultTabPanel); ! defaultTabPanel.setHorizontalGroup(defaultTabPanel.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addGroup(defaultTabPanel.createSequentialGroup() ! .addGap(12) ! .addGroup(defaultTabPanel.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addGroup(GroupLayout.Alignment.TRAILING, defaultTabPanel.createSequentialGroup() ! .addComponent(cancelButtonDefaultPanel) ! .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) ! .addComponent(createButtonDefaultPanel)) ! .addComponent(radioGroupPanel) ! .addComponent(notSoFastCheckBox)) ! .addContainerGap())); ! defaultTabPanel.linkSize(SwingConstants.HORIZONTAL, new Component[] { createButtonDefaultPanel, cancelButtonDefaultPanel }); ! defaultTabPanel.setVerticalGroup(defaultTabPanel.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(GroupLayout.Alignment.TRAILING, defaultTabPanel.createSequentialGroup() ! .addGap(12) ! .addComponent(radioGroupPanel) ! .addGap(12) ! .addComponent(notSoFastCheckBox) ! .addGap(20) ! .addGroup(defaultTabPanel.createParallelGroup(GroupLayout.Alignment.BASELINE) ! .addComponent(createButtonDefaultPanel) ! .addComponent(cancelButtonDefaultPanel)))); newReportTabbedPane.addTab("Default Report", defaultReportPanel); customStrategyTextArea.setTokenMarker(new TailSTokenMarker()); customStrategyPane.setViewportView(customStrategyTextArea); customStrategyPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); *************** *** 412,431 **** } - // private void textAreaTextChanged(KeyEvent keyEvent) { - // if (keyEvent.isControlDown() == true) { - // switch (keyEvent.getKeyCode()) { - // case KeyEvent.VK_SPACE: - // - // // new - // // AutoCompleteForm(customStrategyTextArea).setVisible(true); - // break; - // - // default: - // break; - // } - // } - // // customStrategyTextArea.paste(); - // } - private void defaultPanelCreateButtonActionPerformed(ActionEvent evt) { if (reportNameField.getText().equals("")) { --- 385,388 ---- *************** *** 434,438 **** else { DefaultStrategiesGenerator defaulStrategies = new DefaultStrategiesGenerator(); ! Set<Strategy> strategies = defaulStrategies.generate(stockAnalysis.getStock(), selectedEnum, 4, 60, notSoFastCheckBox.isSelected()); // TODO: Acertas os parametros assim que a tela for finalizada stockAnalysis.addReport(reportNameField.getText(), strategies); --- 391,395 ---- else { DefaultStrategiesGenerator defaulStrategies = new DefaultStrategiesGenerator(); ! Set<Strategy> strategies = defaulStrategies.generate(stockAnalysis.getStock(), selectedEnum, 4, 60); // TODO: Acertas os parametros assim que a tela for finalizada stockAnalysis.addReport(reportNameField.getText(), strategies); |
|
From: Carlos <ma...@us...> - 2007-10-29 18:22:21
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/i18n In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14847/src/java/net/sf/tails/i18n Modified Files: IndicatorDescription.properties Log Message: Ajustada tela de new report. Index: IndicatorDescription.properties =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/i18n/IndicatorDescription.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** IndicatorDescription.properties 29 Oct 2007 17:22:47 -0000 1.5 --- IndicatorDescription.properties 29 Oct 2007 18:22:23 -0000 1.6 *************** *** 4,6 **** ParabolicSarIndicator=Generate default strategy for ParabolicSar indicator using Indicator Crossed Indicator and ParabolicSar And DMI Strategy. BollingerBandsIndicator=Generate default strategy for BollingerBands indicator using Pipe Enter Strategy. ! WMAIndicator=Generate default strategy for WMA indicator using Indicator Crossed Indicator Strategy. \ No newline at end of file --- 4,7 ---- ParabolicSarIndicator=Generate default strategy for ParabolicSar indicator using Indicator Crossed Indicator and ParabolicSar And DMI Strategy. BollingerBandsIndicator=Generate default strategy for BollingerBands indicator using Pipe Enter Strategy. ! WMAIndicator=Generate default strategy for WMA indicator using Indicator Crossed Indicator Strategy. ! NotSoFastStrategy=Don't allow the strategy to sell in less than four ticks after buy. \ No newline at end of file |
|
From: Carlos <ma...@us...> - 2007-10-29 18:22:21
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14847/src/java/net/sf/tails/swing/frame/stockAnalysis Modified Files: NewStockAnalysis2.java Log Message: Ajustada tela de new report. Index: NewStockAnalysis2.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis2.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** NewStockAnalysis2.java 29 Oct 2007 16:48:35 -0000 1.10 --- NewStockAnalysis2.java 29 Oct 2007 18:22:23 -0000 1.11 *************** *** 9,12 **** --- 9,13 ---- import java.awt.Component; import java.awt.Dimension; + import java.awt.Font; import java.awt.GridLayout; import java.awt.Insets; *************** *** 129,133 **** for (String criteriaName : genericCriteria) { JPanel genericCriterionPanel = new JPanel(); ! genericCriterionPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), criteriaName, TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION)); genericCriterionPanel.setLayout(new GridLayout(0, 3, 15, 15)); genericCriterionPanel.setMaximumSize(new Dimension(400, 0)); --- 130,134 ---- for (String criteriaName : genericCriteria) { JPanel genericCriterionPanel = new JPanel(); ! genericCriterionPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), criteriaName, TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, new Font("Dialog", 0, 12))); genericCriterionPanel.setLayout(new GridLayout(0, 3, 15, 15)); genericCriterionPanel.setMaximumSize(new Dimension(400, 0)); |
|
From: Thies <tg...@us...> - 2007-10-29 18:02:38
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6420/src/java/net/sf/tails/swing/helper Modified Files: DefaultStrategiesGenerator.java Log Message: NotSoFast adicionado como estratégia Default Index: DefaultStrategiesGenerator.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper/DefaultStrategiesGenerator.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DefaultStrategiesGenerator.java 29 Oct 2007 17:07:05 -0000 1.6 --- DefaultStrategiesGenerator.java 29 Oct 2007 18:02:35 -0000 1.7 *************** *** 20,23 **** --- 20,24 ---- import net.sf.tail.indicator.tracker.bollingerbands.BollingerBandsUpperIndicator; import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy; + import net.sf.tail.strategy.NotSoFastStrategy; import net.sf.tail.strategy.PipeEnterStrategy; *************** *** 32,36 **** public Set<Strategy> generate(TimeSeries series, ! EnumIndicator indicatorName, int initial, int end) { Set<Strategy> strategies = new HashSet<Strategy>(); --- 33,37 ---- public Set<Strategy> generate(TimeSeries series, ! EnumIndicator indicatorName, int initial, int end, boolean notSoFast) { Set<Strategy> strategies = new HashSet<Strategy>(); *************** *** 38,42 **** Indicator<? extends Number> indicator; Strategy strategy; ! switch (indicatorName) { case SMA: --- 39,43 ---- Indicator<? extends Number> indicator; Strategy strategy; ! switch (indicatorName) { case SMA: *************** *** 44,49 **** indicator = new SMAIndicator(close, i); strategy = new IndicatorCrossedIndicatorStrategy(close, ! indicator); ! strategies.add(strategy); } LOG.info(indicatorDescription.getString("SMAIndicator")); --- 45,53 ---- indicator = new SMAIndicator(close, i); strategy = new IndicatorCrossedIndicatorStrategy(close, ! indicator); ! if(notSoFast) ! strategies.add(new NotSoFastStrategy(strategy, 3)); ! else ! strategies.add(strategy); } LOG.info(indicatorDescription.getString("SMAIndicator")); *************** *** 53,57 **** indicator = new EMAIndicator(close, i); strategy = new IndicatorCrossedIndicatorStrategy(close, indicator); ! strategies.add(strategy); } LOG.info(indicatorDescription.getString("EMAIndicator")); --- 57,64 ---- indicator = new EMAIndicator(close, i); strategy = new IndicatorCrossedIndicatorStrategy(close, indicator); ! if(notSoFast) ! strategies.add(new NotSoFastStrategy(strategy, 3)); ! else ! strategies.add(strategy); } LOG.info(indicatorDescription.getString("EMAIndicator")); *************** *** 64,68 **** new ConstantIndicator<Number>(0.7 * close.getValue(i)), indicator); ! strategies.add(strategy); } LOG.info(indicatorDescription.getString("RSIIndicator")); --- 71,78 ---- new ConstantIndicator<Number>(0.7 * close.getValue(i)), indicator); ! if(notSoFast) ! strategies.add(new NotSoFastStrategy(strategy, 3)); ! else ! strategies.add(strategy); } LOG.info(indicatorDescription.getString("RSIIndicator")); *************** *** 82,86 **** strategy = new PipeEnterStrategy(upper, lower, close); ! strategies.add(strategy); } LOG.info(indicatorDescription.getString("BollingerBandsIndicator")); --- 92,99 ---- strategy = new PipeEnterStrategy(upper, lower, close); ! if(notSoFast) ! strategies.add(new NotSoFastStrategy(strategy, 3)); ! else ! strategies.add(strategy); } LOG.info(indicatorDescription.getString("BollingerBandsIndicator")); *************** *** 90,94 **** indicator = new ParabolicSarIndicator(series, i); strategy = new IndicatorCrossedIndicatorStrategy(indicator, close); ! strategies.add(strategy); } LOG.info(indicatorDescription.getString("ParabolicSarIndicator")); --- 103,110 ---- indicator = new ParabolicSarIndicator(series, i); strategy = new IndicatorCrossedIndicatorStrategy(indicator, close); ! if(notSoFast) ! strategies.add(new NotSoFastStrategy(strategy, 3)); ! else ! strategies.add(strategy); } LOG.info(indicatorDescription.getString("ParabolicSarIndicator")); *************** *** 100,104 **** indicator = new WMAIndicator(close, i); strategy = new IndicatorCrossedIndicatorStrategy(close, indicator); ! strategies.add(strategy); } LOG.info(indicatorDescription.getString("WMAIndicator")); --- 116,123 ---- indicator = new WMAIndicator(close, i); strategy = new IndicatorCrossedIndicatorStrategy(close, indicator); ! if(notSoFast) ! strategies.add(new NotSoFastStrategy(strategy, 3)); ! else ! strategies.add(strategy); } LOG.info(indicatorDescription.getString("WMAIndicator")); |
|
From: Thies <tg...@us...> - 2007-10-29 18:02:32
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6420/src/java/net/sf/tails/swing/frame/report Modified Files: NewReportFrame.java Log Message: NotSoFast adicionado como estratégia Default Index: NewReportFrame.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report/NewReportFrame.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** NewReportFrame.java 29 Oct 2007 17:22:47 -0000 1.26 --- NewReportFrame.java 29 Oct 2007 18:02:35 -0000 1.27 *************** *** 434,438 **** else { DefaultStrategiesGenerator defaulStrategies = new DefaultStrategiesGenerator(); ! Set<Strategy> strategies = defaulStrategies.generate(stockAnalysis.getStock(), selectedEnum, 4, 60); // TODO: Acertas os parametros assim que a tela for finalizada stockAnalysis.addReport(reportNameField.getText(), strategies); --- 434,438 ---- else { DefaultStrategiesGenerator defaulStrategies = new DefaultStrategiesGenerator(); ! Set<Strategy> strategies = defaulStrategies.generate(stockAnalysis.getStock(), selectedEnum, 4, 60, notSoFastCheckBox.isSelected()); // TODO: Acertas os parametros assim que a tela for finalizada stockAnalysis.addReport(reportNameField.getText(), strategies); |
|
From: Carlos <ma...@us...> - 2007-10-29 17:22:48
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21349/src/java/net/sf/tails/swing/frame/report Modified Files: NewReportFrame.java Log Message: Adicionado WMA na tela e mais tratamento de excessao. Index: NewReportFrame.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report/NewReportFrame.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** NewReportFrame.java 29 Oct 2007 16:48:36 -0000 1.25 --- NewReportFrame.java 29 Oct 2007 17:22:47 -0000 1.26 *************** *** 21,24 **** --- 21,25 ---- import javax.swing.ImageIcon; import javax.swing.JButton; + import javax.swing.JCheckBox; import javax.swing.JFileChooser; import javax.swing.JFrame; *************** *** 74,77 **** --- 75,80 ---- private JRadioButton radioButtonBollingerBands; private JRadioButton radioButtonParabolicSAR; + private JRadioButton radioButtonWMA; + private JCheckBox notSoFastCheckBox; private JScrollPane customStrategyPane; private JScrollPane radioGroupScrollPane; *************** *** 112,115 **** --- 115,120 ---- radioButtonBollingerBands = new JRadioButton(); radioButtonParabolicSAR = new JRadioButton(); + radioButtonWMA = new JRadioButton(); + notSoFastCheckBox = new JCheckBox(); customReportPanel = new JPanel(); customStrategyPane = new JScrollPane(); *************** *** 170,173 **** --- 175,179 ---- indicatorsButtonGroup.add(radioButtonBollingerBands); indicatorsButtonGroup.add(radioButtonParabolicSAR); + indicatorsButtonGroup.add(radioButtonWMA); radioButtonSMA.setText("SMA - " + indicatorBundle.getString("SMAIndicator")); *************** *** 210,227 **** } }); GroupLayout radioGroupPanelLayout = new GroupLayout(radioGroupPanel); radioGroupPanel.setLayout(radioGroupPanelLayout); ! radioGroupPanelLayout.setHorizontalGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup( ! radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(radioButtonSMA)).addGroup( ! radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(radioButtonEMA)).addGroup( ! radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(radioButtonRSI)).addGroup( ! radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(radioButtonBollingerBands)) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addComponent(radioButtonParabolicSAR)) .addGap(314, 314, 314)); ! radioGroupPanelLayout.setVerticalGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup( ! radioGroupPanelLayout.createSequentialGroup().addComponent(radioButtonSMA).addGap(10, 10, 10).addComponent(radioButtonEMA).addGap(10, ! 10, 10).addComponent(radioButtonRSI).addGap(10, 10, 10).addComponent(radioButtonBollingerBands).addGap(10, 10, 10) ! .addComponent(radioButtonParabolicSAR).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, 82, Short.MAX_VALUE).addContainerGap())); radioGroupScrollPane.setViewportView(radioGroupPanel); --- 216,264 ---- } }); + + radioButtonWMA.setText("WMA - " + indicatorBundle.getString("WMAIndicator")); + radioButtonWMA.setMargin(new Insets(0, 0, 0, 0)); + radioButtonWMA.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent evt) { + selectedEnum = EnumIndicator.WMA; + } + }); + + notSoFastCheckBox.setText("Not So Fast Strategy"); + notSoFastCheckBox.setMargin(new Insets(0, 0, 0, 0)); GroupLayout radioGroupPanelLayout = new GroupLayout(radioGroupPanel); radioGroupPanel.setLayout(radioGroupPanelLayout); ! radioGroupPanelLayout.setHorizontalGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(radioButtonSMA)) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(radioButtonEMA)) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(radioButtonRSI)) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(radioButtonBollingerBands)) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(radioButtonParabolicSAR)) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(radioButtonWMA)) ! .addGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) ! .addComponent(notSoFastCheckBox)) .addGap(314, 314, 314)); ! radioGroupPanelLayout.setVerticalGroup(radioGroupPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING).addGroup(radioGroupPanelLayout.createSequentialGroup() ! .addComponent(radioButtonSMA) ! .addGap(10, 10, 10) ! .addComponent(radioButtonEMA) ! .addGap(10,10, 10) ! .addComponent(radioButtonRSI) ! .addGap(10, 10, 10) ! .addComponent(radioButtonBollingerBands) ! .addGap(10, 10, 10) ! .addComponent(radioButtonParabolicSAR) ! .addGap(10, 10, 10) ! .addComponent(radioButtonWMA) ! .addGap(10, 10, 10) ! .addComponent(notSoFastCheckBox) ! .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, 82, Short.MAX_VALUE).addContainerGap())); radioGroupScrollPane.setViewportView(radioGroupPanel); *************** *** 392,395 **** --- 429,436 ---- private void defaultPanelCreateButtonActionPerformed(ActionEvent evt) { + if (reportNameField.getText().equals("")) { + JOptionPane.showMessageDialog(null, messageBundle.getString("EMPTY_REPORT_NAME"), "Error", 2); + } + else { DefaultStrategiesGenerator defaulStrategies = new DefaultStrategiesGenerator(); Set<Strategy> strategies = defaulStrategies.generate(stockAnalysis.getStock(), selectedEnum, 4, 60); *************** *** 399,402 **** --- 440,444 ---- index.appendConsoleArea("Report " + reportNameField.getText() + " added succesfully."); this.dispose(); + } } *************** *** 406,428 **** private void customStrategyCreateButtonActionPerformed(ActionEvent evt) { ! ! try { ! TailDSL dsl = null; try { ! String dslHeader = read("/rubyDSLutils.rb"); ! dsl = new RubyDSL(dslHeader, stockAnalysis.getStock()); ! } catch (Exception e) { ! JOptionPane.showMessageDialog(null, "File not found: rubyDSLutils.rb .", "Error", 2); } - Set<Strategy> strategies; - strategies = dsl.evalStrategies(customStrategyTextArea.getText()); - stockAnalysis.addReport(reportNameField.getText(), strategies); - index.loadStockAnalysis(stockAnalysis); - index.appendConsoleArea("Report " + reportNameField.getText() + " added succesfully."); - this.dispose(); - } catch (ScriptException e) { - e.printStackTrace(); } - } --- 448,473 ---- private void customStrategyCreateButtonActionPerformed(ActionEvent evt) { ! if (reportNameField.getText().equals("")) { ! JOptionPane.showMessageDialog(null, messageBundle.getString("EMPTY_REPORT_NAME"), "Error", 2); ! } ! else { try { ! TailDSL dsl = null; ! try { ! String dslHeader = read("/rubyDSLutils.rb"); ! dsl = new RubyDSL(dslHeader, stockAnalysis.getStock()); ! } catch (Exception e) { ! JOptionPane.showMessageDialog(null, "File not found: rubyDSLutils.rb .", "Error", 2); ! } ! Set<Strategy> strategies; ! strategies = dsl.evalStrategies(customStrategyTextArea.getText()); ! stockAnalysis.addReport(reportNameField.getText(), strategies); ! index.loadStockAnalysis(stockAnalysis); ! index.appendConsoleArea("Report " + reportNameField.getText() + " added succesfully."); ! this.dispose(); ! } catch (ScriptException e) { ! e.printStackTrace(); } } } |
|
From: Carlos <ma...@us...> - 2007-10-29 17:22:45
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/i18n In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21349/src/java/net/sf/tails/i18n Modified Files: Messages.properties IndicatorDescription.properties Log Message: Adicionado WMA na tela e mais tratamento de excessao. Index: Messages.properties =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/i18n/Messages.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Messages.properties 24 Oct 2007 20:56:49 -0000 1.4 --- Messages.properties 29 Oct 2007 17:22:47 -0000 1.5 *************** *** 20,22 **** INVALID_SLICESNUMBER_FIELD =Please enter only numbers on Number of Slices field. NEGATIVE_SLICESNUMBER_FIELD =Number of Slices field must be greater than zero. ! REPORT_HTML_ERROR =Exportation error, please restart the application. \ No newline at end of file --- 20,23 ---- INVALID_SLICESNUMBER_FIELD =Please enter only numbers on Number of Slices field. NEGATIVE_SLICESNUMBER_FIELD =Number of Slices field must be greater than zero. ! REPORT_HTML_ERROR =Exportation error, please restart the application. ! EMPTY_REPORT_NAME =Please enter report name. \ No newline at end of file Index: IndicatorDescription.properties =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/i18n/IndicatorDescription.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** IndicatorDescription.properties 29 Oct 2007 17:07:35 -0000 1.4 --- IndicatorDescription.properties 29 Oct 2007 17:22:47 -0000 1.5 *************** *** 4,6 **** ParabolicSarIndicator=Generate default strategy for ParabolicSar indicator using Indicator Crossed Indicator and ParabolicSar And DMI Strategy. BollingerBandsIndicator=Generate default strategy for BollingerBands indicator using Pipe Enter Strategy. ! WMAIndicator=Generate default strategy for WMA indicator using Indicator Crossed Indicator Strategy \ No newline at end of file --- 4,6 ---- ParabolicSarIndicator=Generate default strategy for ParabolicSar indicator using Indicator Crossed Indicator and ParabolicSar And DMI Strategy. BollingerBandsIndicator=Generate default strategy for BollingerBands indicator using Pipe Enter Strategy. ! WMAIndicator=Generate default strategy for WMA indicator using Indicator Crossed Indicator Strategy. \ No newline at end of file |
