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: Márcio V. d. S. <mv...@us...> - 2007-10-08 19:38:16
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/report/xls In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12839/src/test/net/sf/tail/report/xls Modified Files: CompleteXlsGeneratorExecutor.java Log Message: Index: CompleteXlsGeneratorExecutor.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/xls/CompleteXlsGeneratorExecutor.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CompleteXlsGeneratorExecutor.java 5 Oct 2007 20:55:01 -0000 1.8 --- CompleteXlsGeneratorExecutor.java 8 Oct 2007 19:38:15 -0000 1.9 *************** *** 23,27 **** import net.sf.tail.analysis.criteria.TotalProfitCriterion; import net.sf.tail.analysis.criteria.VersusBuyAndHoldCriterion; ! import net.sf.tail.analysis.evaluator.BestStrategyEvaluator; import net.sf.tail.analysis.walk.WalkForward; import net.sf.tail.indicator.simple.ClosePriceIndicator; --- 23,27 ---- import net.sf.tail.analysis.criteria.TotalProfitCriterion; import net.sf.tail.analysis.criteria.VersusBuyAndHoldCriterion; ! import net.sf.tail.analysis.evaluator.HigherValueEvaluator; import net.sf.tail.analysis.walk.WalkForward; import net.sf.tail.indicator.simple.ClosePriceIndicator; *************** *** 51,55 **** } ! Walker w = new WalkForward(new BestStrategyEvaluator(new HistoryRunner(OperationType.BUY))); Indicator<Double> close = new ClosePriceIndicator(timeSeries); --- 51,55 ---- } ! Walker w = new WalkForward(new HigherValueEvaluator(new HistoryRunner(OperationType.BUY))); Indicator<Double> close = new ClosePriceIndicator(timeSeries); |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-08 19:38:15
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/analysis In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12839/src/java/net/sf/tail/analysis Modified Files: StockAnalysis.java Log Message: Index: StockAnalysis.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/StockAnalysis.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** StockAnalysis.java 5 Oct 2007 20:55:01 -0000 1.9 --- StockAnalysis.java 8 Oct 2007 19:38:14 -0000 1.10 *************** *** 7,11 **** import net.sf.tail.AnalysisCriterion; ! import net.sf.tail.Evaluator; import net.sf.tail.Strategy; import net.sf.tail.TimeSeriesSlicer; --- 7,11 ---- import net.sf.tail.AnalysisCriterion; ! import net.sf.tail.StrategyEvaluator; import net.sf.tail.Strategy; import net.sf.tail.TimeSeriesSlicer; *************** *** 27,31 **** private Stock stock; ! private Evaluator evaluator; private List<Report> reports; --- 27,31 ---- private Stock stock; ! private StrategyEvaluator evaluator; private List<Report> reports; *************** *** 33,37 **** private WalkForward walker; ! public StockAnalysis(Stock stock, AnalysisCriterion applyedCriterion, TimeSeriesSlicer slicer, Evaluator evaluator) { this.stock = stock; this.applyedCriterion = applyedCriterion; --- 33,37 ---- private WalkForward walker; ! public StockAnalysis(Stock stock, AnalysisCriterion applyedCriterion, TimeSeriesSlicer slicer, StrategyEvaluator evaluator) { this.stock = stock; this.applyedCriterion = applyedCriterion; *************** *** 79,83 **** } ! public Evaluator getEvaluator() { return evaluator; } --- 79,83 ---- } ! public StrategyEvaluator getEvaluator() { return evaluator; } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-08 19:38:15
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/walk In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12839/src/test/net/sf/tail/analysis/walk Modified Files: WalkForwardTest.java Log Message: Index: WalkForwardTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/walk/WalkForwardTest.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** WalkForwardTest.java 3 Oct 2007 22:56:47 -0000 1.19 --- WalkForwardTest.java 8 Oct 2007 19:38:14 -0000 1.20 *************** *** 8,12 **** import net.sf.tail.AnalysisCriterion; ! import net.sf.tail.Evaluator; import net.sf.tail.Operation; import net.sf.tail.OperationType; --- 8,12 ---- import net.sf.tail.AnalysisCriterion; ! import net.sf.tail.StrategyEvaluator; import net.sf.tail.Operation; import net.sf.tail.OperationType; *************** *** 16,20 **** import net.sf.tail.Walker; import net.sf.tail.analysis.criteria.TotalProfitCriterion; ! import net.sf.tail.analysis.evaluator.BestStrategyEvaluator; import net.sf.tail.analysis.evaluator.Decision; import net.sf.tail.runner.HistoryRunner; --- 16,20 ---- import net.sf.tail.Walker; import net.sf.tail.analysis.criteria.TotalProfitCriterion; ! import net.sf.tail.analysis.evaluator.HigherValueEvaluator; import net.sf.tail.analysis.evaluator.Decision; import net.sf.tail.runner.HistoryRunner; *************** *** 38,42 **** private TimeSeries series; ! private Evaluator evaluator; private Operation[] enter; --- 38,42 ---- private TimeSeries series; ! private StrategyEvaluator evaluator; private Operation[] enter; *************** *** 58,62 **** this.criteria = new TotalProfitCriterion(); this.series = new SampleTimeSeries(data, dates); ! this.evaluator = new BestStrategyEvaluator(new HistoryRunner(OperationType.BUY)); enter = new Operation[] { new Operation(0, OperationType.BUY), null, null, null, null, null, --- 58,62 ---- this.criteria = new TotalProfitCriterion(); this.series = new SampleTimeSeries(data, dates); ! this.evaluator = new HigherValueEvaluator(new HistoryRunner(OperationType.BUY)); enter = new Operation[] { new Operation(0, OperationType.BUY), null, null, null, null, null, |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-08 19:38:15
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12839/src/java/net/sf/tail Added Files: StrategyEvaluator.java Removed Files: Evaluator.java Log Message: --- Evaluator.java DELETED --- --- NEW FILE: StrategyEvaluator.java --- package net.sf.tail; import java.util.Set; import net.sf.tail.analysis.evaluator.Decision; public interface StrategyEvaluator { /** * Apply all <code>strategies</code> in <code>series</code>, and return * the best decision according to <code>criterion</code>. * * @param strategies * @param series * @param criterion * @return <code>Decision</code> */ Decision evaluate(Set<Strategy> strategies, TimeSeries series, AnalysisCriterion criterion); } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-08 19:38:14
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/walk In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12839/src/java/net/sf/tail/analysis/walk Modified Files: WalkForward.java Log Message: Index: WalkForward.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/walk/WalkForward.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** WalkForward.java 3 Oct 2007 22:56:47 -0000 1.20 --- WalkForward.java 8 Oct 2007 19:38:15 -0000 1.21 *************** *** 6,10 **** import net.sf.tail.AnalysisCriterion; ! import net.sf.tail.Evaluator; import net.sf.tail.Strategy; import net.sf.tail.TimeSeries; --- 6,10 ---- import net.sf.tail.AnalysisCriterion; ! import net.sf.tail.StrategyEvaluator; import net.sf.tail.Strategy; import net.sf.tail.TimeSeries; *************** *** 23,29 **** private static final Logger LOG = Logger.getLogger(WalkForward.class); ! private Evaluator evaluator; ! public WalkForward(Evaluator evaluator) { this.evaluator = evaluator; } --- 23,29 ---- private static final Logger LOG = Logger.getLogger(WalkForward.class); ! private StrategyEvaluator evaluator; ! public WalkForward(StrategyEvaluator evaluator) { this.evaluator = evaluator; } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-08 19:38:14
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/report/html In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12839/src/test/net/sf/tail/report/html Modified Files: CompleteHtmlGeneratorExecutor.java Log Message: Index: CompleteHtmlGeneratorExecutor.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/html/CompleteHtmlGeneratorExecutor.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CompleteHtmlGeneratorExecutor.java 5 Oct 2007 20:55:01 -0000 1.6 --- CompleteHtmlGeneratorExecutor.java 8 Oct 2007 19:38:15 -0000 1.7 *************** *** 21,25 **** import net.sf.tail.analysis.criteria.TotalProfitCriterion; import net.sf.tail.analysis.criteria.VersusBuyAndHoldCriterion; ! import net.sf.tail.analysis.evaluator.BestStrategyEvaluator; import net.sf.tail.analysis.walk.WalkForward; import net.sf.tail.indicator.simple.ClosePriceIndicator; --- 21,25 ---- import net.sf.tail.analysis.criteria.TotalProfitCriterion; import net.sf.tail.analysis.criteria.VersusBuyAndHoldCriterion; ! import net.sf.tail.analysis.evaluator.HigherValueEvaluator; import net.sf.tail.analysis.walk.WalkForward; import net.sf.tail.indicator.simple.ClosePriceIndicator; *************** *** 50,54 **** } ! Walker w = new WalkForward(new BestStrategyEvaluator(new HistoryRunner(OperationType.BUY))); Indicator<Double> close = new ClosePriceIndicator(timeSeries); --- 50,54 ---- } ! Walker w = new WalkForward(new HigherValueEvaluator(new HistoryRunner(OperationType.BUY))); Indicator<Double> close = new ClosePriceIndicator(timeSeries); |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-08 19:38:14
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/dsl/ruby In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12839/src/java/net/sf/tail/dsl/ruby Modified Files: RubyDSL.java Log Message: Index: RubyDSL.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/dsl/ruby/RubyDSL.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RubyDSL.java 1 Oct 2007 22:45:39 -0000 1.4 --- RubyDSL.java 8 Oct 2007 19:38:15 -0000 1.5 *************** *** 49,53 **** engine.put("series", series); engine.put("close", new ClosePriceIndicator(series)); ! engine.eval(header + code); --- 49,53 ---- engine.put("series", series); engine.put("close", new ClosePriceIndicator(series)); ! System.out.println(header+ code); engine.eval(header + code); |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-08 19:38:14
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12839/src/test/net/sf/tail Modified Files: EMACompleteTest.java ReportXmlSerializerTest.java EMAWalkTest.java StockAnalysisXmlSerializerTest.java Log Message: Index: EMACompleteTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/EMACompleteTest.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** EMACompleteTest.java 5 Oct 2007 20:55:00 -0000 1.17 --- EMACompleteTest.java 8 Oct 2007 19:38:14 -0000 1.18 *************** *** 18,22 **** import net.sf.tail.analysis.criteria.RewardRiskRatioCriterion; import net.sf.tail.analysis.criteria.TotalProfitCriterion; ! import net.sf.tail.analysis.evaluator.BestStrategyEvaluator; import net.sf.tail.analysis.walk.WalkForward; import net.sf.tail.flow.CashFlow; --- 18,22 ---- import net.sf.tail.analysis.criteria.RewardRiskRatioCriterion; import net.sf.tail.analysis.criteria.TotalProfitCriterion; ! import net.sf.tail.analysis.evaluator.HigherValueEvaluator; import net.sf.tail.analysis.walk.WalkForward; import net.sf.tail.flow.CashFlow; *************** *** 44,48 **** timeSeries = ctsl.load(new FileInputStream("BaseBovespa/15min/petr4_15min_05102007.csv"), "Ambev (ambv4)"); ! Walker w = new WalkForward(new BestStrategyEvaluator(new HistoryRunner(OperationType.BUY))); Set<Strategy> strategies = new HashSet<Strategy>(); --- 44,48 ---- timeSeries = ctsl.load(new FileInputStream("BaseBovespa/15min/petr4_15min_05102007.csv"), "Ambev (ambv4)"); ! Walker w = new WalkForward(new HigherValueEvaluator(new HistoryRunner(OperationType.BUY))); Set<Strategy> strategies = new HashSet<Strategy>(); Index: EMAWalkTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/EMAWalkTest.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** EMAWalkTest.java 3 Oct 2007 22:56:47 -0000 1.16 --- EMAWalkTest.java 8 Oct 2007 19:38:14 -0000 1.17 *************** *** 11,15 **** import net.sf.tail.analysis.criteria.RewardRiskRatioCriterion; import net.sf.tail.analysis.criteria.TotalProfitCriterion; ! import net.sf.tail.analysis.evaluator.BestStrategyEvaluator; import net.sf.tail.analysis.walk.WalkForward; import net.sf.tail.indicator.simple.ClosePriceIndicator; --- 11,15 ---- import net.sf.tail.analysis.criteria.RewardRiskRatioCriterion; import net.sf.tail.analysis.criteria.TotalProfitCriterion; ! import net.sf.tail.analysis.evaluator.HigherValueEvaluator; import net.sf.tail.analysis.walk.WalkForward; import net.sf.tail.indicator.simple.ClosePriceIndicator; *************** *** 49,53 **** // walks year by year, forgetting the past and generates the report in // /tmp/petr4 ! Walker forward = new WalkForward(new BestStrategyEvaluator(new HistoryRunner(OperationType.BUY))); Report report = forward.walk(strategies, slicer, new TotalProfitCriterion()); ReportHTMLGenerator generator = new ReportHTMLGenerator(); --- 49,53 ---- // walks year by year, forgetting the past and generates the report in // /tmp/petr4 ! Walker forward = new WalkForward(new HigherValueEvaluator(new HistoryRunner(OperationType.BUY))); Report report = forward.walk(strategies, slicer, new TotalProfitCriterion()); ReportHTMLGenerator generator = new ReportHTMLGenerator(); Index: StockAnalysisXmlSerializerTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/StockAnalysisXmlSerializerTest.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** StockAnalysisXmlSerializerTest.java 3 Oct 2007 22:56:47 -0000 1.7 --- StockAnalysisXmlSerializerTest.java 8 Oct 2007 19:38:14 -0000 1.8 *************** *** 15,19 **** import net.sf.tail.analysis.criteria.NumberOfTicksCriterion; import net.sf.tail.analysis.criteria.TotalProfitCriterion; ! import net.sf.tail.analysis.evaluator.BestStrategyEvaluator; import net.sf.tail.indicator.simple.ClosePriceIndicator; import net.sf.tail.indicator.tracker.EMAIndicator; --- 15,19 ---- import net.sf.tail.analysis.criteria.NumberOfTicksCriterion; import net.sf.tail.analysis.criteria.TotalProfitCriterion; ! import net.sf.tail.analysis.evaluator.HigherValueEvaluator; import net.sf.tail.indicator.simple.ClosePriceIndicator; import net.sf.tail.indicator.tracker.EMAIndicator; *************** *** 41,45 **** TimeSeriesSlicer slicer = new FullyMemorizedSlicer(timeSeries, new Period().withDays(1)); Runner runner = new HistoryRunner(OperationType.BUY); ! Evaluator evaluator = new BestStrategyEvaluator(runner); StockAnalysis stockAnalysis = new StockAnalysis(stock, applyedCriterion, slicer, evaluator); --- 41,45 ---- TimeSeriesSlicer slicer = new FullyMemorizedSlicer(timeSeries, new Period().withDays(1)); Runner runner = new HistoryRunner(OperationType.BUY); ! StrategyEvaluator evaluator = new HigherValueEvaluator(runner); StockAnalysis stockAnalysis = new StockAnalysis(stock, applyedCriterion, slicer, evaluator); Index: ReportXmlSerializerTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/ReportXmlSerializerTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ReportXmlSerializerTest.java 3 Oct 2007 22:56:47 -0000 1.5 --- ReportXmlSerializerTest.java 8 Oct 2007 19:38:14 -0000 1.6 *************** *** 11,15 **** import net.sf.tail.analysis.criteria.TotalProfitCriterion; ! import net.sf.tail.analysis.evaluator.BestStrategyEvaluator; import net.sf.tail.analysis.walk.WalkForward; import net.sf.tail.indicator.simple.ClosePriceIndicator; --- 11,15 ---- import net.sf.tail.analysis.criteria.TotalProfitCriterion; ! import net.sf.tail.analysis.evaluator.HigherValueEvaluator; import net.sf.tail.analysis.walk.WalkForward; import net.sf.tail.indicator.simple.ClosePriceIndicator; *************** *** 39,43 **** } ! Walker w = new WalkForward(new BestStrategyEvaluator(new HistoryRunner(OperationType.BUY))); Set<Strategy> strategies = new HashSet<Strategy>(); --- 39,43 ---- } ! Walker w = new WalkForward(new HigherValueEvaluator(new HistoryRunner(OperationType.BUY))); Set<Strategy> strategies = new HashSet<Strategy>(); |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-08 19:38:14
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/analysis In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12839/src/test/net/sf/tail/analysis Modified Files: StockAnalysisTest.java Log Message: Index: StockAnalysisTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/StockAnalysisTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** StockAnalysisTest.java 3 Oct 2007 22:56:47 -0000 1.6 --- StockAnalysisTest.java 8 Oct 2007 19:38:15 -0000 1.7 *************** *** 15,19 **** import net.sf.tail.analysis.criteria.NumberOfTicksCriterion; import net.sf.tail.analysis.criteria.TotalProfitCriterion; ! import net.sf.tail.analysis.evaluator.BestStrategyEvaluator; import net.sf.tail.analysis.walk.WalkForward; import net.sf.tail.io.reader.CedroTimeSeriesLoader; --- 15,19 ---- import net.sf.tail.analysis.criteria.NumberOfTicksCriterion; import net.sf.tail.analysis.criteria.TotalProfitCriterion; ! import net.sf.tail.analysis.evaluator.HigherValueEvaluator; import net.sf.tail.analysis.walk.WalkForward; import net.sf.tail.io.reader.CedroTimeSeriesLoader; *************** *** 37,41 **** private StockAnalysis stockAnalysis; ! private BestStrategyEvaluator evaluator; private RegularSlicer slicer; --- 37,41 ---- private StockAnalysis stockAnalysis; ! private HigherValueEvaluator evaluator; private RegularSlicer slicer; *************** *** 61,65 **** slicer = new RegularSlicer(series, period, date.withYear(2000).withMonthOfYear(7)); Runner runner = new HistoryRunner(OperationType.BUY); ! evaluator = new BestStrategyEvaluator(runner); Operation[] enter = new Operation[] { new Operation(0, OperationType.BUY), null, --- 61,65 ---- slicer = new RegularSlicer(series, period, date.withYear(2000).withMonthOfYear(7)); Runner runner = new HistoryRunner(OperationType.BUY); ! evaluator = new HigherValueEvaluator(runner); Operation[] enter = new Operation[] { new Operation(0, OperationType.BUY), null, |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-08 19:38:14
|
Update of /cvsroot/tail/Tail In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12839 Modified Files: .classpath Log Message: Index: .classpath =================================================================== RCS file: /cvsroot/tail/Tail/.classpath,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** .classpath 29 Sep 2007 15:09:46 -0000 1.20 --- .classpath 8 Oct 2007 19:38:15 -0000 1.21 *************** *** 24,28 **** <classpathentry kind="lib" path="lib/dsl/ruby/jline-0.9.91.jar"/> <classpathentry kind="lib" path="lib/dsl/ruby/jruby.jar"/> ! <classpathentry kind="lib" path="lib/dsl/ruby/jruby-engine.jar"/> <classpathentry kind="lib" path="lib/jython.jar"/> <classpathentry kind="lib" path="lib/jython-engine-1.0-jdk14.jar"/> --- 24,28 ---- <classpathentry kind="lib" path="lib/dsl/ruby/jline-0.9.91.jar"/> <classpathentry kind="lib" path="lib/dsl/ruby/jruby.jar"/> ! <classpathentry kind="lib" path="lib/dsl/ruby/jruby-engine.jar" sourcepath="/TailS/lib/jruby-src-1.0.1.zip"/> <classpathentry kind="lib" path="lib/jython.jar"/> <classpathentry kind="lib" path="lib/jython-engine-1.0-jdk14.jar"/> |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-08 19:38:14
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/evaluator In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12839/src/test/net/sf/tail/analysis/evaluator Modified Files: BestStrategyEvaluatorTest.java Log Message: Index: BestStrategyEvaluatorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/evaluator/BestStrategyEvaluatorTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** BestStrategyEvaluatorTest.java 23 Aug 2007 12:51:08 -0000 1.6 --- BestStrategyEvaluatorTest.java 8 Oct 2007 19:38:14 -0000 1.7 *************** *** 47,51 **** TimeSeries constrainedSeries = new ConstrainedTimeSeries(series, 0, 3); ! BestStrategyEvaluator evaluator = new BestStrategyEvaluator(new HistoryRunner(OperationType.BUY)); Decision decision = evaluator.evaluate(strategies, constrainedSeries, new TotalProfitCriterion()); --- 47,51 ---- TimeSeries constrainedSeries = new ConstrainedTimeSeries(series, 0, 3); ! HigherValueEvaluator evaluator = new HigherValueEvaluator(new HistoryRunner(OperationType.BUY)); Decision decision = evaluator.evaluate(strategies, constrainedSeries, new TotalProfitCriterion()); *************** *** 58,62 **** TimeSeries constrainedSeries = new ConstrainedTimeSeries(series, 0, 3); ! BestStrategyEvaluator evaluator = new BestStrategyEvaluator(new HistoryRunner(OperationType.BUY)); Decision decision = evaluator.evaluate(strategies, constrainedSeries, new TotalProfitCriterion()); --- 58,62 ---- TimeSeries constrainedSeries = new ConstrainedTimeSeries(series, 0, 3); ! HigherValueEvaluator evaluator = new HigherValueEvaluator(new HistoryRunner(OperationType.BUY)); Decision decision = evaluator.evaluate(strategies, constrainedSeries, new TotalProfitCriterion()); |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-08 19:38:14
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/io In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12839/src/test/net/sf/tail/io Modified Files: SerializerTest.java Log Message: Index: SerializerTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/io/SerializerTest.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** SerializerTest.java 8 Oct 2007 19:15:28 -0000 1.9 --- SerializerTest.java 8 Oct 2007 19:38:15 -0000 1.10 *************** *** 18,22 **** import net.sf.tail.analysis.criteria.NumberOfTicksCriterion; import net.sf.tail.analysis.criteria.TotalProfitCriterion; ! import net.sf.tail.analysis.evaluator.BestStrategyEvaluator; import net.sf.tail.indicator.simple.ClosePriceIndicator; import net.sf.tail.indicator.tracker.EMAIndicator; --- 18,22 ---- import net.sf.tail.analysis.criteria.NumberOfTicksCriterion; import net.sf.tail.analysis.criteria.TotalProfitCriterion; ! import net.sf.tail.analysis.evaluator.HigherValueEvaluator; import net.sf.tail.indicator.simple.ClosePriceIndicator; import net.sf.tail.indicator.tracker.EMAIndicator; *************** *** 42,46 **** private Stock stock; ! private BestStrategyEvaluator evaluator; @Before --- 42,46 ---- private Stock stock; ! private HigherValueEvaluator evaluator; @Before *************** *** 50,54 **** runner = new HistoryRunner(OperationType.BUY); ! evaluator = new BestStrategyEvaluator(runner); applyedCriterion = new TotalProfitCriterion(); --- 50,54 ---- runner = new HistoryRunner(OperationType.BUY); ! evaluator = new HigherValueEvaluator(runner); applyedCriterion = new TotalProfitCriterion(); |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-08 19:38:14
|
Update of /cvsroot/tail/Tail/dsl In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12839/dsl Modified Files: rubyDSLutils.rb Log Message: Index: rubyDSLutils.rb =================================================================== RCS file: /cvsroot/tail/Tail/dsl/rubyDSLutils.rb,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** rubyDSLutils.rb 3 Oct 2007 22:30:34 -0000 1.4 --- rubyDSLutils.rb 8 Oct 2007 19:38:14 -0000 1.5 *************** *** 11,96 **** end ! def averageGain(timeFrame) ! Tail::AverageGainIndicator.new($close, timeFrame) ! end ! ! def averageGain ! Tail::AverageGainIndicator.new($close, $series.getSize()) ! end ! ! def averageLoss(timeFrame) ! Tail::AverageLossIndicator.new($close, timeFrame) ! end ! ! def averageLoss ! Tail::AverageLossIndicator.new($close, $series.getSize()) ! end ! ! def max(indicator) ! Tail::HighestValueIndicator.new(indicator, $series.getSize()) ! end ! ! def min(indicator) ! Tail::LowestValueIndicator.new(indicator, $series.getSize()) ! end ! ! def averageDirectionalMovement(timeFrame) ! Tail::AverageDirectionalMovementIndicator.new($series, timeFrame) ! end ! ! def directionalMovement(timeFrame) ! Tail::DirectionalMovementIndicator.new($series, timeFrame) ! end ! ! def onBalanceVolume ! Tail::OnBalanceVolumeIndicator.new($series) ! end ! ! def standartDeviation(indicator, timeFrame) ! Tail::StandartDeviationIndicator.new(indicator, timeFrame) ! end ! ! def ema(timeFrame) ! Tail::EMAIndicator.new($close, timeFrame) ! end ! ! def parabolicSAR ! Tail::ParabolicSarIndicator.new($series) ! end ! ! def RSI(timeFrame) ! Tail::RSIIndicator.new(close, timeFrame) ! end ! ! def close ! Tail::ClosePriceIndicator.new($series) ! end ! ! def amount ! Tail::AmountIndicator.new($series) ! end ! ! def maxPrice ! Tail::MaxPriceIndicator.new($series) ! end ! ! def minPrice ! Tail::MinPriceIndicator.new($series) ! end ! ! def openPrice ! Tail::OpenPriceIndicator.new($series) ! end ! ! def volume ! Tail::VolumeIndicator.new($series) ! end ! ! def sma (timeFrame) ! Tail::SMAIndicator.new($close, timeFrame) end ! def WilliamsR(timeFrame) ! Tail::WilliamsRIndicator.new($close, timeFrame) end --- 11,20 ---- end ! def ema (number) ! Tail::EMAIndicator.new($close, number) end ! def sma (number) ! Tail::SMAIndicator.new($close, number) end |
|
From: Thies <tg...@us...> - 2007-10-08 19:19:05
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/criteria In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4409/src/java/net/sf/tail/analysis/criteria Modified Files: TotalProfitCriterion.java Added Files: BrazilianTotalProfitCriterion.java BrazilianTransactionCostsCriterion.java Log Message: Novos criterias e refatoracao no totalProfit Index: TotalProfitCriterion.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/criteria/TotalProfitCriterion.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** TotalProfitCriterion.java 4 Sep 2007 13:09:14 -0000 1.16 --- TotalProfitCriterion.java 8 Oct 2007 19:19:05 -0000 1.17 *************** *** 1,5 **** package net.sf.tail.analysis.criteria; - import java.util.ArrayList; import java.util.LinkedList; import java.util.List; --- 1,4 ---- *************** *** 21,24 **** --- 20,38 ---- } + 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) { + return calculateProfit(series, trade); + + } + private double calculateProfit(TimeSeries series, Trade trade) { double exitClosePrice = series.getTick(trade.getExit().getIndex()).getClosePrice(); *************** *** 34,53 **** } - 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() { --- 48,51 ---- *************** *** 68,72 **** return true; } - } --- 66,69 ---- --- NEW FILE: BrazilianTotalProfitCriterion.java --- package net.sf.tail.analysis.criteria; import java.util.LinkedList; import java.util.List; import net.sf.tail.AnalysisCriterion; import net.sf.tail.OperationType; import net.sf.tail.TimeSeries; import net.sf.tail.Trade; import net.sf.tail.analysis.evaluator.Decision; public class BrazilianTotalProfitCriterion implements AnalysisCriterion { public double calculate(TimeSeries series, Trade trade) { return calculateProfit(series, trade); } public double calculate(TimeSeries series, List<Trade> trades) { double value = 1d; for (Trade trade : trades) { value *= calculateProfit(series, trade); } return value; } 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); } private double calculateProfit(TimeSeries series, Trade trade) { double exitClosePrice = series.getTick(trade.getExit().getIndex()).getClosePrice(); double entryClosePrice = series.getTick(trade.getEntry().getIndex()).getClosePrice(); if (trade.getEntry().getType() == OperationType.BUY) { return (exitClosePrice * 0.99965d) / (entryClosePrice * 1.00035d); } return (entryClosePrice * 0.99965d) / (exitClosePrice * 1.00035d); } @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; } } --- NEW FILE: BrazilianTransactionCostsCriterion.java --- package net.sf.tail.analysis.criteria; import java.util.ArrayList; 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 BrazilianTransactionCostsCriterion implements AnalysisCriterion { public double calculate(TimeSeries series, Trade trade) { return 40d; } public double calculate(TimeSeries series, List<Trade> trades) { return 40d * trades.size(); } public double summarize(TimeSeries series, List<Decision> decisions) { List<Trade> trades = new ArrayList<Trade>(); for (Decision decision : decisions) { trades.addAll(decision.getTrades()); } 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-08 19:19:05
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/analysis/criteria In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4409/src/test/net/sf/tail/analysis/criteria Added Files: BrazilianTotalProfitCriterionTest.java BrazilianTransactionCostsCriterionTest.java Log Message: Novos criterias e refatoracao no totalProfit --- NEW FILE: BrazilianTransactionCostsCriterionTest.java --- package net.sf.tail.analysis.criteria; import static org.junit.Assert.assertEquals; 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.sample.SampleTimeSeries; import org.junit.Test; public class BrazilianTransactionCostsCriterionTest { @Test public void testCalculate() { SampleTimeSeries series = new SampleTimeSeries(new double[] { 100, 105, 110, 100, 95, 105 }); List<Trade> trades = new ArrayList<Trade>(); AnalysisCriterion brazilianCost = new BrazilianTransactionCostsCriterion(); trades.add(new Trade(new Operation(0, OperationType.BUY), new Operation(1, OperationType.SELL))); assertEquals(40d, brazilianCost.calculate(series, trades)); trades.add(new Trade(new Operation(2, OperationType.BUY), new Operation(3, OperationType.SELL))); assertEquals(80d, brazilianCost.calculate(series, trades)); trades.add(new Trade(new Operation(4, OperationType.BUY), new Operation(5, OperationType.SELL))); assertEquals(120d, brazilianCost.calculate(series, trades)); } @Test public void testCalculateWithOneTrade() { SampleTimeSeries series = new SampleTimeSeries(new double[] { 100, 95, 100, 80, 85, 70 }); Trade trade = new Trade(new Operation(0, OperationType.BUY), new Operation(1, OperationType.SELL)); AnalysisCriterion brazilianCost = new BrazilianTransactionCostsCriterion(); assertEquals(40d, brazilianCost.calculate(series, trade)); } @Test public void testSummarize() { SampleTimeSeries series = new SampleTimeSeries(new double[] { 100, 95, 100, 80, 85, 70 }); List<Trade> trades = new ArrayList<Trade>(); List<Decision> decisions = new ArrayList<Decision>(); trades.add(new Trade(new Operation(0, OperationType.BUY), new Operation(1, OperationType.SELL))); decisions.add(new Decision(null, null, null, trades, null)); trades = new ArrayList<Trade>(); trades.add(new Trade(new Operation(2, OperationType.BUY), new Operation(3, OperationType.SELL))); trades.add(new Trade(new Operation(4, OperationType.BUY), new Operation(5, OperationType.SELL))); decisions.add(new Decision(null, null, null, trades, null)); decisions.add(new Decision(null, null, null, trades, null)); AnalysisCriterion brazilianCosts = new BrazilianTransactionCostsCriterion(); assertEquals(200d, brazilianCosts.summarize(series, decisions)); } } --- NEW FILE: BrazilianTotalProfitCriterionTest.java --- package net.sf.tail.analysis.criteria; import static org.junit.Assert.assertEquals; 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.sample.SampleTimeSeries; import org.junit.Test; public class BrazilianTotalProfitCriterionTest { @Test public void testCalculateOnlyWithGainTrades() { SampleTimeSeries series = new SampleTimeSeries(new double[] { 100, 105, 110, 100, 95, 105 }); List<Trade> trades = new ArrayList<Trade>(); trades.add(new Trade(new Operation(0, OperationType.BUY), new Operation(2, OperationType.SELL))); trades.add(new Trade(new Operation(3, OperationType.BUY), new Operation(5, OperationType.SELL))); AnalysisCriterion profit = new BrazilianTotalProfitCriterion(); assertEquals(((110 * 0.99965d) / (100 * 1.00035d)) * ((105 * 0.99965d) / (100 * 1.00035d)), profit.calculate(series, trades)); } @Test public void testCalculateOnlyWithLossTrades() { SampleTimeSeries series = new SampleTimeSeries(new double[] { 100, 95, 100, 80, 85, 70 }); 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))); AnalysisCriterion profit = new BrazilianTotalProfitCriterion(); assertEquals(((95 * 0.99965d) / (100 * 1.00035d)) * ((70 * 0.99965d) / (100 * 1.00035d)), profit.calculate(series, trades)); } @Test public void testCalculateProfitWithTradesThatStartSelling() { SampleTimeSeries series = new SampleTimeSeries(new double[] { 100, 95, 100, 80, 85, 70 }); List<Trade> trades = new ArrayList<Trade>(); trades.add(new Trade(new Operation(0, OperationType.SELL), new Operation(1, OperationType.BUY))); trades.add(new Trade(new Operation(2, OperationType.SELL), new Operation(5, OperationType.BUY))); AnalysisCriterion profit = new BrazilianTotalProfitCriterion(); assertEquals(((100 * 0.99965d) / (95d * 1.00035d)) * ((100 * 0.99965d) / (70 * 1.00035d)), profit.calculate(series, trades)); } @Test public void testCalculateWithNoTradesShouldReturn1() { SampleTimeSeries series = new SampleTimeSeries(new double[] { 100, 95, 100, 80, 85, 70 }); List<Trade> trades = new ArrayList<Trade>(); AnalysisCriterion profit = new BrazilianTotalProfitCriterion(); assertEquals(1d, profit.calculate(series, trades)); } @Test public void testSummarize() { SampleTimeSeries series = new SampleTimeSeries(new double[] { 100, 95, 100, 80, 85, 70 }); List<Trade> trades = new ArrayList<Trade>(); List<Decision> decisions = new ArrayList<Decision>(); AnalysisCriterion profit = new BrazilianTotalProfitCriterion(); 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))); decisions.add(new Decision(null, null, null, trades, null)); trades = new ArrayList<Trade>(); trades.add(new Trade(new Operation(0, OperationType.SELL), new Operation(1, OperationType.BUY))); trades.add(new Trade(new Operation(2, OperationType.SELL), new Operation(5, OperationType.BUY))); double value1 = ((100 * 0.99965d) / (95d * 1.00035d)) * ((100 * 0.99965d) / (70 * 1.00035d)); double value2 = ((95 * 0.99965d) / (100 * 1.00035d)) * ((70 * 0.99965d) / (100 * 1.00035d)); decisions.add(new Decision(null, null, null, trades, null)); assertEquals(value1 * value2, profit.summarize(series, decisions)); } @Test public void testWithOneTrade() { SampleTimeSeries series = new SampleTimeSeries(new double[] { 100, 95, 100, 80, 85, 70 }); Trade trade = new Trade(new Operation(0, OperationType.BUY), new Operation(1, OperationType.SELL)); AnalysisCriterion profit = new BrazilianTotalProfitCriterion(); assertEquals(((95 * 0.99965d) / (100 * 1.00035d)), profit.calculate(series, trade)); } } |
|
From: xanaot <xa...@us...> - 2007-10-08 19:16:16
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/series In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3108/src/test/net/sf/tail/series Modified Files: PartialMemorizesSlicerTest.java Log Message: Arrumando testes do Serializer. Refatoração da classe PartialMemorizedSlicer quando periodsPerSlice menor que 1 e testes da classe Index: PartialMemorizesSlicerTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/series/PartialMemorizesSlicerTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PartialMemorizesSlicerTest.java 5 Oct 2007 20:55:00 -0000 1.2 --- PartialMemorizesSlicerTest.java 8 Oct 2007 19:15:28 -0000 1.3 *************** *** 15,18 **** --- 15,20 ---- private DateTime date; + + private TimeSeriesSlicer slicer; @Before *************** *** 20,32 **** this.date = new DateTime(0); } ! @Test ! public void testApllyForRegularSlicer(){ series = new SampleTimeSeries(date.withYear(2000), date.withYear(2001), date.withYear(2002), date .withYear(2003), date.withYear(2004)); Period period = new Period().withYears(1); ! PartialMemorizedSlicer slicer = new PartialMemorizedSlicer(series, period, 1); ! assertEquals(0, slicer.getSlice(0).getBegin()); assertEquals(1, slicer.getSlice(1).getBegin()); --- 22,34 ---- this.date = new DateTime(0); } ! @Test ! public void testApllyForRegularSlicer() { series = new SampleTimeSeries(date.withYear(2000), date.withYear(2001), date.withYear(2002), date .withYear(2003), date.withYear(2004)); Period period = new Period().withYears(1); ! slicer = new PartialMemorizedSlicer(series, period, 1); ! assertEquals(0, slicer.getSlice(0).getBegin()); assertEquals(1, slicer.getSlice(1).getBegin()); *************** *** 35,47 **** assertEquals(4, slicer.getSlice(4).getBegin()); } ! @Test ! public void testStartDateBeforeTimeSeriesDate(){ series = new SampleTimeSeries(date.withYear(2000), date.withYear(2001), date.withYear(2002), date .withYear(2003), date.withYear(2004)); Period period = new Period().withYears(1); ! PartialMemorizedSlicer slicer = new PartialMemorizedSlicer(series, period, date.withYear(1980), 1); ! assertEquals(0, slicer.getSlice(0).getBegin()); assertEquals(1, slicer.getSlice(1).getBegin()); --- 37,56 ---- assertEquals(4, slicer.getSlice(4).getBegin()); } ! ! @Test(expected = IllegalArgumentException.class) ! public void testPeriodsPerSliceGreaterThan1() { ! series = new SampleTimeSeries(date.withYear(2000), date.withYear(2001), date.withYear(2002), date ! .withYear(2003), date.withYear(2004)); ! slicer = new PartialMemorizedSlicer(series, new Period().withYears(1), 0); ! } ! @Test ! public void testStartDateBeforeTimeSeriesDate() { series = new SampleTimeSeries(date.withYear(2000), date.withYear(2001), date.withYear(2002), date .withYear(2003), date.withYear(2004)); Period period = new Period().withYears(1); ! slicer = new PartialMemorizedSlicer(series, period, date.withYear(1980), 1); ! assertEquals(0, slicer.getSlice(0).getBegin()); assertEquals(1, slicer.getSlice(1).getBegin()); *************** *** 50,104 **** assertEquals(4, slicer.getSlice(4).getBegin()); } @Test ! public void testApllyForPartialMemorizedSlicer(){ series = new SampleTimeSeries(date.withYear(2000), date.withYear(2001), date.withYear(2002), date .withYear(2003), date.withYear(2004)); Period period = new Period().withYears(1); ! PartialMemorizedSlicer slicer = new PartialMemorizedSlicer(series, period, 3); ! assertEquals(0, slicer.getSlice(0).getBegin()); assertEquals(0, slicer.getSlice(0).getEnd()); ! assertEquals(0, slicer.getSlice(1).getBegin()); assertEquals(1, slicer.getSlice(1).getEnd()); ! assertEquals(0, slicer.getSlice(2).getBegin()); assertEquals(2, slicer.getSlice(2).getEnd()); ! assertEquals(1, slicer.getSlice(3).getBegin()); assertEquals(3, slicer.getSlice(3).getEnd()); ! assertEquals(2, slicer.getSlice(4).getBegin()); assertEquals(4, slicer.getSlice(4).getEnd()); } ! ! @Test ! public void testApllyForFullMemorizedSlicer(){ series = new SampleTimeSeries(date.withYear(2000), date.withYear(2001), date.withYear(2002), date .withYear(2003), date.withYear(2004)); Period period = new Period().withYears(1); ! PartialMemorizedSlicer slicer = new PartialMemorizedSlicer(series, period, series.getSize()); ! assertEquals(0, slicer.getSlice(0).getBegin()); assertEquals(0, slicer.getSlice(0).getEnd()); ! assertEquals(0, slicer.getSlice(1).getBegin()); assertEquals(1, slicer.getSlice(1).getEnd()); ! assertEquals(0, slicer.getSlice(2).getBegin()); assertEquals(2, slicer.getSlice(2).getEnd()); ! assertEquals(0, slicer.getSlice(3).getBegin()); assertEquals(3, slicer.getSlice(3).getEnd()); ! assertEquals(0, slicer.getSlice(4).getBegin()); assertEquals(4, slicer.getSlice(4).getEnd()); } ! @Test ! public void testApllyForSeries(){ series = new SampleTimeSeries(date.withYear(2000), date.withYear(2001), date.withYear(2002), date .withYear(2003), date.withYear(2004)); --- 59,113 ---- assertEquals(4, slicer.getSlice(4).getBegin()); } + @Test ! public void testApllyForPartialMemorizedSlicer() { series = new SampleTimeSeries(date.withYear(2000), date.withYear(2001), date.withYear(2002), date .withYear(2003), date.withYear(2004)); Period period = new Period().withYears(1); ! slicer = new PartialMemorizedSlicer(series, period, 3); ! assertEquals(0, slicer.getSlice(0).getBegin()); assertEquals(0, slicer.getSlice(0).getEnd()); ! assertEquals(0, slicer.getSlice(1).getBegin()); assertEquals(1, slicer.getSlice(1).getEnd()); ! assertEquals(0, slicer.getSlice(2).getBegin()); assertEquals(2, slicer.getSlice(2).getEnd()); ! assertEquals(1, slicer.getSlice(3).getBegin()); assertEquals(3, slicer.getSlice(3).getEnd()); ! assertEquals(2, slicer.getSlice(4).getBegin()); assertEquals(4, slicer.getSlice(4).getEnd()); } ! @Test ! public void testApllyForFullMemorizedSlicer() { series = new SampleTimeSeries(date.withYear(2000), date.withYear(2001), date.withYear(2002), date .withYear(2003), date.withYear(2004)); Period period = new Period().withYears(1); ! slicer = new PartialMemorizedSlicer(series, period, series.getSize()); ! assertEquals(0, slicer.getSlice(0).getBegin()); assertEquals(0, slicer.getSlice(0).getEnd()); ! assertEquals(0, slicer.getSlice(1).getBegin()); assertEquals(1, slicer.getSlice(1).getEnd()); ! assertEquals(0, slicer.getSlice(2).getBegin()); assertEquals(2, slicer.getSlice(2).getEnd()); ! assertEquals(0, slicer.getSlice(3).getBegin()); assertEquals(3, slicer.getSlice(3).getEnd()); ! assertEquals(0, slicer.getSlice(4).getBegin()); assertEquals(4, slicer.getSlice(4).getEnd()); } ! @Test ! public void testApllyForSeries() { series = new SampleTimeSeries(date.withYear(2000), date.withYear(2001), date.withYear(2002), date .withYear(2003), date.withYear(2004)); *************** *** 108,114 **** TimeSeriesSlicer newSlicer = slicer.applyForSeries(series); ! assertEquals(slicer, newSlicer); ! series = new SampleTimeSeries(date.withYear(2000), date.withYear(2000), date.withYear(2000), date .withYear(2001), date.withYear(2001), date.withYear(2001), date.withYear(2002), date.withYear(2002), --- 117,123 ---- TimeSeriesSlicer newSlicer = slicer.applyForSeries(series); ! assertEquals(slicer, newSlicer); ! series = new SampleTimeSeries(date.withYear(2000), date.withYear(2000), date.withYear(2000), date .withYear(2001), date.withYear(2001), date.withYear(2001), date.withYear(2002), date.withYear(2002), *************** *** 145,158 **** assertEquals(0, split.getSlice(0).getBegin()); assertEquals(0, split.getSlice(0).getEnd()); ! assertEquals(0, split.getSlice(1).getBegin()); assertEquals(1, split.getSlice(1).getEnd()); ! assertEquals(0, split.getSlice(2).getBegin()); assertEquals(2, split.getSlice(2).getEnd()); ! assertEquals(1, split.getSlice(3).getBegin()); assertEquals(3, split.getSlice(3).getEnd()); ! assertEquals(2, split.getSlice(4).getBegin()); assertEquals(4, split.getSlice(4).getEnd()); --- 154,167 ---- assertEquals(0, split.getSlice(0).getBegin()); assertEquals(0, split.getSlice(0).getEnd()); ! assertEquals(0, split.getSlice(1).getBegin()); assertEquals(1, split.getSlice(1).getEnd()); ! assertEquals(0, split.getSlice(2).getBegin()); assertEquals(2, split.getSlice(2).getEnd()); ! assertEquals(1, split.getSlice(3).getBegin()); assertEquals(3, split.getSlice(3).getEnd()); ! assertEquals(2, split.getSlice(4).getBegin()); assertEquals(4, split.getSlice(4).getEnd()); *************** *** 208,212 **** } - @Test public void testSplitByYearBeginningInJuly() { --- 217,220 ---- *************** *** 217,221 **** 1, 1), date.withDate(2002, 1, 2), date.withDate(2002, 1, 3), date.withDate(2002, 5, 5), date .withDate(2003, 3, 3)); ! TimeSeriesSlicer split = new PartialMemorizedSlicer(series, period, 2); --- 225,229 ---- 1, 1), date.withDate(2002, 1, 2), date.withDate(2002, 1, 3), date.withDate(2002, 5, 5), date .withDate(2003, 3, 3)); ! TimeSeriesSlicer split = new PartialMemorizedSlicer(series, period, 2); *************** *** 288,293 **** } ! ! ! } --- 296,299 ---- } ! } |
|
From: xanaot <xa...@us...> - 2007-10-08 19:15:28
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/io In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3108/src/test/net/sf/tail/io Modified Files: SerializerTest.java Log Message: Arrumando testes do Serializer. Refatoração da classe PartialMemorizedSlicer quando periodsPerSlice menor que 1 e testes da classe Index: SerializerTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/io/SerializerTest.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SerializerTest.java 3 Oct 2007 22:56:47 -0000 1.8 --- SerializerTest.java 8 Oct 2007 19:15:28 -0000 1.9 *************** *** 8,16 **** import java.util.Set; - import net.sf.tail.Evaluator; import net.sf.tail.Indicator; import net.sf.tail.OperationType; import net.sf.tail.Strategy; - import net.sf.tail.TimeSeries; import net.sf.tail.TimeSeriesSlicer; import net.sf.tail.analysis.Stock; --- 8,14 ---- *************** *** 27,35 **** import net.sf.tail.io.reader.CedroTimeSeriesLoader; import net.sf.tail.runner.HistoryRunner; - import net.sf.tail.sample.SampleTimeSeries; import net.sf.tail.series.FullyMemorizedSlicer; import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy; - import org.joda.time.DateTime; import org.joda.time.Period; import org.junit.Before; --- 25,31 ---- *************** *** 38,45 **** public class SerializerTest { - private DateTime date; - - private TimeSeries timeSeries; - private TotalProfitCriterion applyedCriterion; --- 34,37 ---- *************** *** 48,65 **** private HistoryRunner runner; @Before public void setUp() throws Exception { ! date = new DateTime(); - timeSeries = new SampleTimeSeries(date.withYear(2000), date.withDate(2000, 2, 20), date.withDate(2000, 4, 25), - date.withYear(2002), date.withYear(2003)); runner = new HistoryRunner(OperationType.BUY); applyedCriterion = new TotalProfitCriterion(); ! slicer = new FullyMemorizedSlicer(timeSeries, new Period().withDays(1)); } @Test public void testStockSerializer() throws FileNotFoundException, IOException { - Stock stock = new Stock("test", "BaseBovespa/15min/ambv4.csv", new CedroTimeSeriesLoader()); StockSerializer serializer = new StockSerializer(); String serializedStock = serializer.toXML(stock); --- 40,61 ---- private HistoryRunner runner; + private Stock stock; + + private BestStrategyEvaluator evaluator; + @Before public void setUp() throws Exception { ! stock = new Stock("test", "BaseBovespa/tests/Cedro-ReaderTest.csv", new CedroTimeSeriesLoader()); ! slicer = new FullyMemorizedSlicer(stock.getSeries(), new Period().withDays(1)); runner = new HistoryRunner(OperationType.BUY); + evaluator = new BestStrategyEvaluator(runner); + applyedCriterion = new TotalProfitCriterion(); ! } @Test public void testStockSerializer() throws FileNotFoundException, IOException { StockSerializer serializer = new StockSerializer(); String serializedStock = serializer.toXML(stock); *************** *** 72,78 **** public void testStockAnalysisSerializer() throws FileNotFoundException, IOException { - Stock stock = new Stock("test", "BaseBovespa/15min/ambv4.csv", new CedroTimeSeriesLoader()); - - Evaluator evaluator = new BestStrategyEvaluator(runner); StockAnalysis stockAnalysis = new StockAnalysis(stock, applyedCriterion, slicer, evaluator); --- 68,71 ---- *************** *** 84,88 **** for (int i = 4; i < 20; i++) { ! Indicator<Double> close = new ClosePriceIndicator(timeSeries); Indicator<Double> tracker = new EMAIndicator(close, i); Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker); --- 77,81 ---- for (int i = 4; i < 20; i++) { ! Indicator<Double> close = new ClosePriceIndicator(stock.getSeries()); Indicator<Double> tracker = new EMAIndicator(close, i); Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker); *************** *** 95,99 **** for (int i = 4; i < 20; i++) { ! Indicator<Double> close = new ClosePriceIndicator(timeSeries); Indicator<Double> tracker = new SMAIndicator(close, i); Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker); --- 88,92 ---- for (int i = 4; i < 20; i++) { ! Indicator<Double> close = new ClosePriceIndicator(stock.getSeries()); Indicator<Double> tracker = new SMAIndicator(close, i); Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker); *************** *** 106,111 **** for (int i = 4; i < 20; i++) { ! Indicator<Double> close = new ClosePriceIndicator(timeSeries); ! Indicator<Double> tracker = new WilliamsRIndicator(timeSeries, i); Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker); strategies.add(strategy); --- 99,104 ---- for (int i = 4; i < 20; i++) { ! Indicator<Double> close = new ClosePriceIndicator(stock.getSeries()); ! Indicator<Double> tracker = new WilliamsRIndicator(stock.getSeries(), i); Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker); strategies.add(strategy); |
|
From: xanaot <xa...@us...> - 2007-10-08 19:15:28
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/series In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3108/src/java/net/sf/tail/series Modified Files: PartialMemorizedSlicer.java RegularSlicer.java Log Message: Arrumando testes do Serializer. Refatoração da classe PartialMemorizedSlicer quando periodsPerSlice menor que 1 e testes da classe Index: RegularSlicer.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/series/RegularSlicer.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RegularSlicer.java 3 Oct 2007 23:56:58 -0000 1.3 --- RegularSlicer.java 8 Oct 2007 19:15:28 -0000 1.4 *************** *** 16,18 **** --- 16,19 ---- this(series, period, series.getTick(0).getDate()); } + } Index: PartialMemorizedSlicer.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/series/PartialMemorizedSlicer.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PartialMemorizedSlicer.java 5 Oct 2007 20:55:00 -0000 1.4 --- PartialMemorizedSlicer.java 8 Oct 2007 19:15:28 -0000 1.5 *************** *** 13,17 **** import org.joda.time.Period; ! public class PartialMemorizedSlicer implements TimeSeriesSlicer{ protected transient TimeSeries series; --- 13,17 ---- import org.joda.time.Period; ! public class PartialMemorizedSlicer implements TimeSeriesSlicer { protected transient TimeSeries series; *************** *** 21,41 **** protected DateTime periodBegin; ! protected int periodsPerSlice; private transient static Logger LOG = Logger.getLogger(PartialMemorizedSlicer.class); ! ! public PartialMemorizedSlicer(TimeSeries series, Period period,DateTime periodBegin, int periodsPerSlice) { ! int index = series.getBegin(); ! ! if(periodBegin.isBefore(series.getTick(index).getDate())) periodBegin = series.getTick(series.getBegin()).getDate(); Interval interval = new Interval(periodBegin, periodBegin.plus(period)); ! ! while (series.getTick(index).getDate().isBefore(interval.getStart())) index++; ! ! this.series = new ConstrainedTimeSeries(series, index, series.getEnd()); this.period = period; this.splittedSeries = new ArrayList<TimeSeries>(); --- 21,45 ---- protected DateTime periodBegin; ! protected int periodsPerSlice; private transient static Logger LOG = Logger.getLogger(PartialMemorizedSlicer.class); ! ! public PartialMemorizedSlicer(TimeSeries series, Period period, DateTime periodBegin, int periodsPerSlice) { ! if(periodsPerSlice < 1) ! throw new IllegalArgumentException("Periods per slice must be greater than 1"); + int index = series.getBegin(); + + DateTime inicialSeriesDate = series.getTick(index).getDate(); + if (periodBegin.isBefore(inicialSeriesDate) && !periodBegin.equals(inicialSeriesDate)) + periodBegin = series.getTick(series.getBegin()).getDate(); + Interval interval = new Interval(periodBegin, periodBegin.plus(period)); ! while (series.getTick(index).getDate().isBefore(interval.getStart())) index++; ! ! this.series = new ConstrainedTimeSeries(series, index, series.getEnd()); this.period = period; this.splittedSeries = new ArrayList<TimeSeries>(); *************** *** 44,48 **** split(); } ! public PartialMemorizedSlicer(TimeSeries series, Period period, int periodsPerSlice) { this(series, period, series.getTick(series.getBegin()).getDate(), periodsPerSlice); --- 48,52 ---- split(); } ! public PartialMemorizedSlicer(TimeSeries series, Period period, int periodsPerSlice) { this(series, period, series.getTick(series.getBegin()).getDate(), periodsPerSlice); *************** *** 60,64 **** int sliceBeginIndex = index; ! List<Integer> begins = new ArrayList<Integer>(); begins.add(index); while (index <= series.getEnd()) { --- 64,68 ---- int sliceBeginIndex = index; ! List<Integer> begins = new ArrayList<Integer>(); begins.add(index); while (index <= series.getEnd()) { *************** *** 70,74 **** LOG.debug(String.format("Interval %s before %s ", interval, series.getTick(index).getDate())); ! sliceBeginIndex = index; begins.add(sliceBeginIndex); --- 74,78 ---- LOG.debug(String.format("Interval %s before %s ", interval, series.getTick(index).getDate())); ! sliceBeginIndex = index; begins.add(sliceBeginIndex); *************** *** 92,97 **** } public TimeSeriesSlicer applyForSeries(TimeSeries series) { ! return new PartialMemorizedSlicer(series, this.period, this.periodBegin, this.periodsPerSlice); } --- 96,105 ---- } + public TimeSeriesSlicer applyForSeries(TimeSeries series, DateTime periodBegin) { + return new PartialMemorizedSlicer(series, this.period, periodBegin, this.periodsPerSlice); + } + public TimeSeriesSlicer applyForSeries(TimeSeries series) { ! return applyForSeries(series, this.periodBegin); } *************** *** 136,140 **** return sPeriod.substring(0, sPeriod.length() - 2); } ! @Override public int hashCode() { --- 144,148 ---- return sPeriod.substring(0, sPeriod.length() - 2); } ! @Override public int hashCode() { *************** *** 163,175 **** if (other.periodBegin != null) return false; ! } else if (!periodBegin.equals(other.periodBegin)) return false; return true; } ! ! ! ! ! } --- 171,185 ---- if (other.periodBegin != null) return false; ! } else if (!periodBegin.equals(other.periodBegin)) { ! System.out.println(periodBegin.toString()); ! System.out.println(other.periodBegin.toString()); return false; + } return true; } ! public DateTime getPeriodBegin() { ! return periodBegin; ! } ! } |
|
From: xanaot <xa...@us...> - 2007-10-08 19:15:27
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3108/src/java/net/sf/tail Modified Files: TimeSeriesSlicer.java Log Message: Arrumando testes do Serializer. Refatoração da classe PartialMemorizedSlicer quando periodsPerSlice menor que 1 e testes da classe Index: TimeSeriesSlicer.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/TimeSeriesSlicer.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** TimeSeriesSlicer.java 3 Oct 2007 22:56:47 -0000 1.10 --- TimeSeriesSlicer.java 8 Oct 2007 19:15:28 -0000 1.11 *************** *** 1,4 **** --- 1,5 ---- package net.sf.tail; + import org.joda.time.DateTime; import org.joda.time.Period; *************** *** 17,20 **** --- 18,23 ---- Period getPeriod(); + DateTime getPeriodBegin(); + TimeSeriesSlicer applyForSeries(TimeSeries series); } \ No newline at end of file |
|
From: xanaot <xa...@us...> - 2007-10-08 17:01:21
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/series In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15211/src/test/net/sf/tail/series Modified Files: RegularSlicerTest.java Log Message: Acerto no teste Index: RegularSlicerTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/series/RegularSlicerTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RegularSlicerTest.java 3 Oct 2007 22:56:47 -0000 1.1 --- RegularSlicerTest.java 8 Oct 2007 17:01:21 -0000 1.2 *************** *** 188,204 **** TimeSeriesSlicer split = new RegularSlicer(series, period, date.withDate(2000, 1, 1)); ! assertEquals(4, split.getSlices()); assertEquals(0, split.getSlice(0).getBegin()); ! assertEquals(2, split.getSlice(0).getEnd()); ! ! assertEquals(3, split.getSlice(1).getBegin()); ! assertEquals(5, split.getSlice(1).getEnd()); ! assertEquals(6, split.getSlice(2).getBegin()); ! assertEquals(9, split.getSlice(2).getEnd()); ! assertEquals(10, split.getSlice(3).getBegin()); ! assertEquals(10, split.getSlice(3).getEnd()); } --- 188,201 ---- TimeSeriesSlicer split = new RegularSlicer(series, period, date.withDate(2000, 1, 1)); ! assertEquals(3, split.getSlices()); assertEquals(0, split.getSlice(0).getBegin()); ! assertEquals(4, split.getSlice(0).getEnd()); ! assertEquals(5, split.getSlice(1).getBegin()); ! assertEquals(9, split.getSlice(1).getEnd()); ! assertEquals(10, split.getSlice(2).getBegin()); ! assertEquals(10, split.getSlice(2).getEnd()); } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-05 20:55:53
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23093/src/java/net/sf/tails/swing/frame/report Modified Files: NewReportFrame.java Log Message: Index: NewReportFrame.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report/NewReportFrame.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** NewReportFrame.java 3 Oct 2007 22:59:04 -0000 1.10 --- NewReportFrame.java 5 Oct 2007 20:55:40 -0000 1.11 *************** *** 146,149 **** --- 146,150 ---- customStrategyTextArea.setTokenMarker(new TailSTokenMarker()); + customStrategyTextArea.addKeyListener(new KeyListener(){ @Override *************** *** 237,241 **** private void textAreaTextChanged(KeyEvent keyEvent) { ! //customStrategyTextArea.append("oi"); } --- 238,246 ---- private void textAreaTextChanged(KeyEvent keyEvent) { ! System.out.println("dnwidnwinwdindwidwni"); ! if(keyEvent.isControlDown() == true && keyEvent.getKeyChar() == 'c'){ ! System.out.println("kokokok"); ! } ! customStrategyTextArea.paste(); } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-05 20:55:53
|
Update of /cvsroot/tail/TailS/src/test/net In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23093/src/test/net Added Files: Tteste.java Log Message: --- NEW FILE: Tteste.java --- package net; import net.sf.tails.swing.helper.FrameHelper; import org.junit.Before; import org.junit.Test; public class Tteste { @Before public void setUp() throws Exception { } @Test public void test() throws ClassNotFoundException { for (String s : FrameHelper.getCriteriaFilesTeste()) { System.out.println(s); } } } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-05 20:55:53
|
Update of /cvsroot/tail/TailS In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23093 Modified Files: .classpath Log Message: Index: .classpath =================================================================== RCS file: /cvsroot/tail/TailS/.classpath,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** .classpath 3 Oct 2007 20:20:34 -0000 1.10 --- .classpath 5 Oct 2007 20:55:40 -0000 1.11 *************** *** 9,15 **** <classpathentry kind="lib" path="lib/joda-time-1.4-src-ide.zip"/> <classpathentry kind="lib" path="lib/poi-3.0.1-FINAL-20070705.jar"/> - <classpathentry kind="lib" path="lib/jeditsyntaxpackage.jar"/> <classpathentry kind="src" path="dsl"/> <classpathentry combineaccessrules="false" kind="src" path="/Tail"/> <classpathentry kind="output" path="bin"/> </classpath> --- 9,15 ---- <classpathentry kind="lib" path="lib/joda-time-1.4-src-ide.zip"/> <classpathentry kind="lib" path="lib/poi-3.0.1-FINAL-20070705.jar"/> <classpathentry kind="src" path="dsl"/> <classpathentry combineaccessrules="false" kind="src" path="/Tail"/> + <classpathentry combineaccessrules="false" kind="src" path="/JEditSyntaxPackage"/> <classpathentry kind="output" path="bin"/> </classpath> |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-05 20:55:53
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23093/src/java/net/sf/tails/swing/helper Modified Files: FrameHelper.java Log Message: Index: FrameHelper.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper/FrameHelper.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** FrameHelper.java 3 Oct 2007 22:04:10 -0000 1.12 --- FrameHelper.java 5 Oct 2007 20:55:40 -0000 1.13 *************** *** 13,16 **** --- 13,17 ---- import java.io.File; import java.io.FileReader; + import java.net.URL; import java.util.ArrayList; import java.util.List; *************** *** 50,70 **** } ! // public static List<String> getCriteriaFilesTeste() throws ClassNotFoundException { ! // List<String> classes = new ArrayList<String>(); ! // ClassLoader cld = Thread.currentThread().getContextClassLoader(); ! // String path = '/' + packageBundle.getString("CRITERIA_PACKAGE") ! // .replace('.', '/'); ! // URL resource = cld.getResource(path); ! // File directory = new File(resource.getFile()); ! // if (directory.exists()) { ! // String[] files = directory.list(); ! // for (int i = 0; i < files.length; i++) { ! // if (files[i].endsWith(".class")) { ! // classes.add(files[i].split(".class")[0]); ! // } ! // } ! // } ! // return classes; ! // } public static List<String> getLoaderFiles() { --- 51,71 ---- } ! public static List<String> getCriteriaFilesTeste() throws ClassNotFoundException { ! List<String> classes = new ArrayList<String>(); ! ClassLoader cld = Thread.currentThread().getContextClassLoader(); ! String path = '/' + packageBundle.getString("CRITERIA_PACKAGE") ! .replace('.', '/'); ! URL resource = cld.getResource(path); ! File directory = new File(resource.getFile()); ! if (directory.exists()) { ! String[] files = directory.list(); ! for (int i = 0; i < files.length; i++) { ! if (files[i].endsWith(".class")) { ! classes.add(files[i].split(".class")[0]); ! } ! } ! } ! return classes; ! } public static List<String> getLoaderFiles() { |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-05 20:55:00
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/analysis In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22554/src/java/net/sf/tail/analysis Modified Files: StockAnalysis.java Log Message: Index: StockAnalysis.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/StockAnalysis.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** StockAnalysis.java 3 Oct 2007 18:49:58 -0000 1.8 --- StockAnalysis.java 5 Oct 2007 20:55:01 -0000 1.9 *************** *** 15,18 **** --- 15,20 ---- public class StockAnalysis implements Serializable { + + private static final long serialVersionUID = 8039932898223937322L; |
