tail-cvs — cvs commits

[Tail-cvs] Tail/src/java/net/sf/tail/analysis/walk WalkForward.java, 1.23

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/walk
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7865/src/java/net/sf/tail/analysis/walk

Modified Files:
	WalkForward.java 
Log Message:
Mega refatoração, Runner não está mais vendendo no final de cada slice

Index: WalkForward.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/walk/WalkForward.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** WalkForward.java	15 Oct 2007 20:23:24 -0000	1.22
--- WalkForward.java	21 Nov 2007 21:55:20 -0000	1.23
***************
*** 6,17 ****
  
  import net.sf.tail.AnalysisCriterion;
- import net.sf.tail.StrategyEvaluator;
  import net.sf.tail.Strategy;
! import net.sf.tail.TimeSeries;
  import net.sf.tail.TimeSeriesSlicer;
  import net.sf.tail.Walker;
  import net.sf.tail.analysis.evaluator.Decision;
  import net.sf.tail.report.Report;
! import net.sf.tail.series.RegularSlicer;
  
  import org.apache.log4j.Logger;
--- 6,17 ----
  
  import net.sf.tail.AnalysisCriterion;
  import net.sf.tail.Strategy;
! import net.sf.tail.StrategyEvaluator;
  import net.sf.tail.TimeSeriesSlicer;
  import net.sf.tail.Walker;
  import net.sf.tail.analysis.evaluator.Decision;
+ import net.sf.tail.analysis.evaluator.StrategyEvaluatorFactory;
  import net.sf.tail.report.Report;
! import net.sf.tail.runner.RunnerFactory;
  
  import org.apache.log4j.Logger;
***************
*** 22,53 ****
  	
  	private static final Logger LOG = Logger.getLogger(WalkForward.class);
  
- 	private StrategyEvaluator evaluator;
  
! 	public WalkForward(StrategyEvaluator evaluator) {
! 		this.evaluator = evaluator;
  	}
  
  	public Report walk(Set<Strategy> strategies, TimeSeriesSlicer slicer, AnalysisCriterion criterion) {
  
- 		TimeSeriesSlicer regularSlicer = new RegularSlicer(slicer.getSeries(), slicer.getPeriod(), slicer.getSlice(0).getTick(slicer.getSlice(0).getBegin()).getDate());
- 		
  		LOG.info("Running strategies");
  		List<Decision> decisions = new LinkedList<Decision>();
  
! 		Decision lastDecision = evaluator.evaluate(strategies, slicer.getSlice(0), criterion);
  
  		LOG.info("First best decision calculated: " + lastDecision);
  
  		for (int i = 1; i < slicer.getSlices(); i++) {
! 			TimeSeries currentSeries = slicer.getSlice(i);
! 			TimeSeries regularSeries = regularSlicer.getSlice(i);
! 
! 			Decision bestAppliedForCurrentSeries = lastDecision.applyFor(regularSeries);
  			LOG.info(String
  					.format("Applying last best decision for time series %d: %s", i, bestAppliedForCurrentSeries));
  			decisions.add(bestAppliedForCurrentSeries);
  
! 			lastDecision = evaluator.evaluate(strategies, currentSeries, criterion);
  			LOG.info("Best decision for period " + i + ": " + lastDecision);
  
--- 22,51 ----
  	
  	private static final Logger LOG = Logger.getLogger(WalkForward.class);
+ 	private StrategyEvaluatorFactory evaluatorFactory;
+ 	private RunnerFactory runnerFactory;
  
  
! 	public WalkForward(StrategyEvaluatorFactory evaluatorFactory,RunnerFactory runnerFactory) {
! 		this.evaluatorFactory = evaluatorFactory;
! 		this.runnerFactory = runnerFactory;
  	}
  
  	public Report walk(Set<Strategy> strategies, TimeSeriesSlicer slicer, AnalysisCriterion criterion) {
  
  		LOG.info("Running strategies");
  		List<Decision> decisions = new LinkedList<Decision>();
  
! 		StrategyEvaluator evaluator = evaluatorFactory.create(runnerFactory, strategies, slicer, criterion);
! 		Decision lastDecision = evaluator.evaluate(0);
  
  		LOG.info("First best decision calculated: " + lastDecision);
  
  		for (int i = 1; i < slicer.getSlices(); i++) {
! 			Decision bestAppliedForCurrentSeries = lastDecision.applyFor(i);
  			LOG.info(String
  					.format("Applying last best decision for time series %d: %s", i, bestAppliedForCurrentSeries));
  			decisions.add(bestAppliedForCurrentSeries);
  
! 			lastDecision = evaluator.evaluate(i);
  			LOG.info("Best decision for period " + i + ": " + lastDecision);
  

[Tail-cvs] Tail/src/java/net/sf/tail/runner RunnerFactory.java, 1.1 HistoryRunnerFactory.java, 1.1 HistoryRunner.java, 1.20 ShortSellRunner.java, 1.4

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/java/net/sf/tail/runner
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7865/src/java/net/sf/tail/runner

Modified Files:
	HistoryRunner.java ShortSellRunner.java 
Added Files:
	RunnerFactory.java HistoryRunnerFactory.java 
Log Message:
Mega refatoração, Runner não está mais vendendo no final de cada slice

--- NEW FILE: RunnerFactory.java ---
package net.sf.tail.runner;

import net.sf.tail.Runner;
import net.sf.tail.Strategy;
import net.sf.tail.TimeSeriesSlicer;

public interface RunnerFactory {
	Runner create(Strategy strategy,TimeSeriesSlicer slicer);
}

--- NEW FILE: HistoryRunnerFactory.java ---
package net.sf.tail.runner;

import net.sf.tail.Runner;
import net.sf.tail.Strategy;
import net.sf.tail.TimeSeriesSlicer;

public class HistoryRunnerFactory implements RunnerFactory {

	public Runner create(Strategy strategy, TimeSeriesSlicer slicer) {
		return new HistoryRunner(slicer,strategy);
	}

}

Index: HistoryRunner.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/runner/HistoryRunner.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** HistoryRunner.java	31 Oct 2007 16:24:39 -0000	1.19
--- HistoryRunner.java	21 Nov 2007 21:55:20 -0000	1.20
***************
*** 4,42 ****
  import java.util.List;
  
- import org.apache.log4j.Logger;
- 
  import net.sf.tail.OperationType;
  import net.sf.tail.Runner;
  import net.sf.tail.Strategy;
  import net.sf.tail.Trade;
  
  public class HistoryRunner implements Runner {
  
  	private OperationType operationType;
  
  	private static final Logger LOG = Logger.getLogger(HistoryRunner.class);
  
! 	public HistoryRunner(OperationType type) {
! 		if (type == null)
  			throw new NullPointerException();
  		this.operationType = type;
  	}
! 	public HistoryRunner()
  	{
! 		this.operationType = OperationType.BUY;
  	}
  
! 	public List<Trade> run(Strategy strategy, int start, int end) {
  
- 		if (start < 0 || end < 0)
- 			throw new IndexOutOfBoundsException();
  
! 		if (start > end)
! 			throw new IllegalArgumentException();
  
  		LOG.info("running strategy " + strategy);
  		List<Trade> trades = new ArrayList<Trade>();
  		Trade lastTrade = new Trade(operationType);
! 		for (int i = Math.max(start, 0); i <= end; i++) {
  			if (strategy.shouldOperate(lastTrade, i)) {
  				lastTrade.operate(i);
--- 4,83 ----
  import java.util.List;
  
  import net.sf.tail.OperationType;
  import net.sf.tail.Runner;
  import net.sf.tail.Strategy;
+ import net.sf.tail.TimeSeriesSlicer;
  import net.sf.tail.Trade;
  
+ import org.apache.log4j.Logger;
+ 
  public class HistoryRunner implements Runner {
  
  	private OperationType operationType;
  
+ 	private TimeSeriesSlicer slicer;
+ 
+ 	private Strategy strategy;
+ 
+ 	private ArrayList<List<Trade>> listTradesResults;
+ 
  	private static final Logger LOG = Logger.getLogger(HistoryRunner.class);
  
! 	public HistoryRunner(OperationType type,TimeSeriesSlicer slicer,Strategy strategy) {
! 		if (type == null || slicer == null || strategy == null)
  			throw new NullPointerException();
+ 		this.slicer = slicer;
+ 		this.strategy = strategy;
  		this.operationType = type;
+ 
+ 		listTradesResults = new ArrayList<List<Trade>>();
  	}
! 	public HistoryRunner(TimeSeriesSlicer slicer,Strategy strategy)
  	{
! 		this(OperationType.BUY,slicer,strategy);
  	}
  
! 	public List<Trade> run(int slicePosition) {
! 		if(listTradesResults.size() < slicePosition){
! 			listTradesResults.add(run(slicePosition - 1));
! 		}
! 		else if(listTradesResults.size() > slicePosition){
! 			return listTradesResults.get(slicePosition);
! 		}
  
  
! 		int begin = 0;
! 		int end = 0;
! 		if(listTradesResults.size() == 0){
! 			begin = slicer.getSlice(slicePosition).getBegin();
! 			end = slicer.getSlice(slicePosition).getEnd();
! 		}else{
! 
! 			end = slicer.getSlice(slicePosition).getEnd();
! 
! 			int i = listTradesResults.size()-1;
! 			List<Trade> lastTrades = listTradesResults.get(i);
! 			while(lastTrades.size() == 0 && i > 0){
! 				i--;
! 				lastTrades = listTradesResults.get(i);
! 			}
! 
! 			if(i <= 0){
! 				begin = slicer.getSlice(slicePosition).getBegin();
! 
! 			}else{
! 				Trade lastTrade = lastTrades.get(lastTrades.size()-1);
! 				begin = lastTrade.getExit().getIndex()+1;
! 
! 				if(begin > end){
! 					return new ArrayList<Trade>();
! 				}
! 			}
! 		}
  
  		LOG.info("running strategy " + strategy);
  		List<Trade> trades = new ArrayList<Trade>();
  		Trade lastTrade = new Trade(operationType);
! 		for (int i = Math.max(begin, 0); i <= end; i++) {
  			if (strategy.shouldOperate(lastTrade, i)) {
  				lastTrade.operate(i);
***************
*** 48,85 ****
  			}
  		}
! 		if (lastTrade.isOpened() && lastTrade.getEntry().getIndex() != end) {
! 			lastTrade.operate(end);
! 			LOG.debug("new trade for closing time: " + lastTrade);
! 			;
! 			trades.add(lastTrade);
! 		}
! 
! 		return trades;
! 	}
  
! 	@Override
! 	public int hashCode() {
! 		final int prime = 31;
! 		int result = 1;
! 		result = prime * result + ((operationType == null) ? 0 : operationType.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;
! 		final HistoryRunner other = (HistoryRunner) obj;
! 		if (operationType == null) {
! 			if (other.operationType != null)
! 				return false;
! 		} else if (!operationType.equals(other.operationType))
  			return false;
! 		return true;
! 	}
  
  }
--- 89,151 ----
  			}
  		}
! 		if (lastTrade.isOpened()) {
! 			int j = 1;
! 			while(slicer.getSlices() > slicePosition + j) {
! 				int start = slicer.getSlice(slicePosition + j).getBegin();
! 				int last = slicer.getSlice(slicePosition + j).getEnd();
  
! 				for (int i = start; i <= last; i++) {
! 					if (strategy.shouldOperate(lastTrade, i)) {
! 						lastTrade.operate(i);
! 						break;
! 					}
! 				}
! 				if(lastTrade.isClosed()){
! 					trades.add(lastTrade);
! 					LOG.debug("new trade: " + lastTrade);
! 					break;
! 				}
! 				j++;
! 			}
  	}
! 	listTradesResults.add(trades);
! 	return trades;
! }
! @Override
! public int hashCode() {
! 	final int prime = 31;
! 	int result = 1;
! 	result = prime * result + ((operationType == null) ? 0 : operationType.hashCode());
! 	result = prime * result + ((slicer == null) ? 0 : slicer.hashCode());
! 	result = prime * result + ((strategy == null) ? 0 : strategy.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;
! 	final HistoryRunner other = (HistoryRunner) obj;
! 	if (operationType == null) {
! 		if (other.operationType != null)
  			return false;
! 	} else if (!operationType.equals(other.operationType))
! 		return false;
! 	if (slicer == null) {
! 		if (other.slicer != null)
  			return false;
! 	} else if (!slicer.equals(other.slicer))
! 		return false;
! 	if (strategy == null) {
! 		if (other.strategy != null)
  			return false;
! 	} else if (!strategy.equals(other.strategy))
! 		return false;
! 	return true;
! }
! 
  
  }

Index: ShortSellRunner.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/runner/ShortSellRunner.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ShortSellRunner.java	23 Aug 2007 12:47:26 -0000	1.3
--- ShortSellRunner.java	21 Nov 2007 21:55:20 -0000	1.4
***************
*** 7,10 ****
--- 7,11 ----
  import net.sf.tail.Runner;
  import net.sf.tail.Strategy;
+ import net.sf.tail.TimeSeriesSlicer;
  import net.sf.tail.Trade;
  
***************
*** 12,21 ****
  	private Runner runner;
  
! 	public ShortSellRunner() {
! 		this.runner = new HistoryRunner(OperationType.BUY);
  	}
  
! 	public List<Trade> run(Strategy strategy, int start, int end) {
! 		List<Trade> trades = runner.run(strategy, start, end);
  		List<Trade> tradesWithShortSells = new ArrayList<Trade>();
  
--- 13,22 ----
  	private Runner runner;
  
! 	public ShortSellRunner(TimeSeriesSlicer slicer, Strategy strategy) {
! 		this.runner = new HistoryRunner(slicer, strategy);
  	}
  
! 	public List<Trade> run(int slicePosition) {
! 		List<Trade> trades = runner.run(slicePosition);
  		List<Trade> tradesWithShortSells = new ArrayList<Trade>();
  

[Tail-cvs] TailS/Data/templates/total report.ftl,1.2

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/TailS/Data/templates/total
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7762/Data/templates/total

Modified Files:
	report.ftl 
Log Message:
Mega refatoração, Runner não está mais vendendo no final de cada slice

Index: report.ftl
===================================================================
RCS file: /cvsroot/tail/TailS/Data/templates/total/report.ftl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** report.ftl	10 Oct 2007 19:04:48 -0000	1.1
--- report.ftl	21 Nov 2007 21:55:11 -0000	1.2
***************
*** 32,40 ****
  	<#assign x=x+1>
  		<td>${x}</td>
! 		<td class="date">${decision.series.period}</td>
  		<td class="strategy">${decision.strategy.name}</td>
! 		<td>${report.applyedCriterion.calculate(decision.series, decision.trades)}</td>
  		<#list criterions as criterion>
! 			<td>${criterion.calculate(decision.series, decision.trades)}</td>			
  		</#list>
  	</tr>
--- 32,40 ----
  	<#assign x=x+1>
  		<td>${x}</td>
! 		<td class="date">${decision.getActualSlice().period}</td>
  		<td class="strategy">${decision.strategy.name}</td>
! 		<td>${report.applyedCriterion.calculate(decision.getActualSlice(), decision.trades)}</td>
  		<#list criterions as criterion>
! 			<td>${criterion.calculate(decision.getActualSlice(), decision.trades)}</td>			
  		</#list>
  	</tr>

[Tail-cvs] TailS/lib tail-0.6-SNAPSHOT.jar,1.2

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/TailS/lib
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7762/lib

Modified Files:
	tail-0.6-SNAPSHOT.jar 
Log Message:
Mega refatoração, Runner não está mais vendendo no final de cada slice

Index: tail-0.6-SNAPSHOT.jar
===================================================================
RCS file: /cvsroot/tail/TailS/lib/tail-0.6-SNAPSHOT.jar,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvs2OZzSt and /tmp/cvsnb6Ub1 differ

[Tail-cvs] TailS/src/test/net/sf/tails/swing/helper CompleteXLSGeneratorTest.java, 1.4 ReportImageTest.java, 1.4 CompleteHtmlGeneratorExecutor.java, 1.7 CompleteHtmlGeneratorTest.java, 1.5 CompleteXlsGeneratorExecutor.java, 1.5

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/TailS/src/test/net/sf/tails/swing/helper
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7762/src/test/net/sf/tails/swing/helper

Modified Files:
	CompleteXLSGeneratorTest.java ReportImageTest.java 
	CompleteHtmlGeneratorExecutor.java 
	CompleteHtmlGeneratorTest.java 
	CompleteXlsGeneratorExecutor.java 
Log Message:
Mega refatoração, Runner não está mais vendendo no final de cada slice

Index: ReportImageTest.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/test/net/sf/tails/swing/helper/ReportImageTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ReportImageTest.java	15 Oct 2007 20:23:57 -0000	1.3
--- ReportImageTest.java	21 Nov 2007 21:55:11 -0000	1.4
***************
*** 10,13 ****
--- 10,14 ----
  import net.sf.tail.Operation;
  import net.sf.tail.OperationType;
+ import net.sf.tail.Strategy;
  import net.sf.tail.TimeSeriesSlicer;
  import net.sf.tail.Trade;
***************
*** 46,53 ****
  
  		ArrayList<Decision> decisions = new ArrayList<Decision>();
- 		decision = new Decision(new FakeStrategy(new Operation[0], new Operation[0]), series,
- 				new TotalProfitCriterion(), trades, new HistoryRunner(OperationType.BUY));
- 		decisions.add(decision);
  		TimeSeriesSlicer slicer = new FullyMemorizedSlicer(series, period);
  
  		report = new Report(null,new TotalProfitCriterion(), slicer, decisions);
--- 47,56 ----
  
  		ArrayList<Decision> decisions = new ArrayList<Decision>();
  		TimeSeriesSlicer slicer = new FullyMemorizedSlicer(series, period);
+ 		Strategy strategy = new FakeStrategy(new Operation[0], new Operation[0]);
+ 		decision = new Decision(strategy, slicer, 0,
+ 				new TotalProfitCriterion(), trades, new HistoryRunner(slicer, strategy));
+ 		decisions.add(decision);
+ 		
  
  		report = new Report(null,new TotalProfitCriterion(), slicer, decisions);

Index: CompleteXlsGeneratorExecutor.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/test/net/sf/tails/swing/helper/CompleteXlsGeneratorExecutor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CompleteXlsGeneratorExecutor.java	17 Oct 2007 16:42:10 -0000	1.4
--- CompleteXlsGeneratorExecutor.java	21 Nov 2007 21:55:11 -0000	1.5
***************
*** 12,16 ****
  import net.sf.tail.AnalysisCriterion;
  import net.sf.tail.Indicator;
- import net.sf.tail.OperationType;
  import net.sf.tail.Strategy;
  import net.sf.tail.TimeSeries;
--- 12,15 ----
***************
*** 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;
--- 22,26 ----
  import net.sf.tail.analysis.criteria.TotalProfitCriterion;
  import net.sf.tail.analysis.criteria.VersusBuyAndHoldCriterion;
! import net.sf.tail.analysis.evaluator.HigherValueEvaluatorFactory;
  import net.sf.tail.analysis.walk.WalkForward;
  import net.sf.tail.indicator.simple.ClosePriceIndicator;
***************
*** 29,33 ****
  import net.sf.tail.io.reader.CedroTimeSeriesLoader;
  import net.sf.tail.report.Report;
! import net.sf.tail.runner.HistoryRunner;
  import net.sf.tail.series.FullyMemorizedSlicer;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
--- 28,32 ----
  import net.sf.tail.io.reader.CedroTimeSeriesLoader;
  import net.sf.tail.report.Report;
! import net.sf.tail.runner.HistoryRunnerFactory;
  import net.sf.tail.series.FullyMemorizedSlicer;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
***************
*** 49,53 ****
  		}
  
! 		Walker w = new WalkForward(new HigherValueEvaluator(new HistoryRunner(OperationType.BUY)));
  		Indicator<Double> close = new ClosePriceIndicator(timeSeries);
  
--- 48,52 ----
  		}
  
! 		Walker w = new WalkForward(new HigherValueEvaluatorFactory(), new HistoryRunnerFactory());
  		Indicator<Double> close = new ClosePriceIndicator(timeSeries);
  

Index: CompleteHtmlGeneratorExecutor.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/test/net/sf/tails/swing/helper/CompleteHtmlGeneratorExecutor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CompleteHtmlGeneratorExecutor.java	17 Oct 2007 18:36:58 -0000	1.6
--- CompleteHtmlGeneratorExecutor.java	21 Nov 2007 21:55:11 -0000	1.7
***************
*** 11,15 ****
  import net.sf.tail.AnalysisCriterion;
  import net.sf.tail.Indicator;
- import net.sf.tail.OperationType;
  import net.sf.tail.Strategy;
  import net.sf.tail.TimeSeries;
--- 11,14 ----
***************
*** 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;
--- 20,24 ----
  import net.sf.tail.analysis.criteria.TotalProfitCriterion;
  import net.sf.tail.analysis.criteria.VersusBuyAndHoldCriterion;
! import net.sf.tail.analysis.evaluator.HigherValueEvaluatorFactory;
  import net.sf.tail.analysis.walk.WalkForward;
  import net.sf.tail.indicator.simple.ClosePriceIndicator;
***************
*** 27,31 ****
  import net.sf.tail.io.reader.CedroTimeSeriesLoader;
  import net.sf.tail.report.Report;
! import net.sf.tail.runner.HistoryRunner;
  import net.sf.tail.series.FullyMemorizedSlicer;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
--- 26,30 ----
  import net.sf.tail.io.reader.CedroTimeSeriesLoader;
  import net.sf.tail.report.Report;
! import net.sf.tail.runner.HistoryRunnerFactory;
  import net.sf.tail.series.FullyMemorizedSlicer;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
***************
*** 48,52 ****
  		}
  
! 		Walker w = new WalkForward(new HigherValueEvaluator(new HistoryRunner(OperationType.BUY)));
  		Indicator<Double> close = new ClosePriceIndicator(timeSeries);
  
--- 47,51 ----
  		}
  
! 		Walker w = new WalkForward(new HigherValueEvaluatorFactory(), new HistoryRunnerFactory());
  		Indicator<Double> close = new ClosePriceIndicator(timeSeries);
  

Index: CompleteXLSGeneratorTest.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/test/net/sf/tails/swing/helper/CompleteXLSGeneratorTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CompleteXLSGeneratorTest.java	15 Oct 2007 20:23:57 -0000	1.3
--- CompleteXLSGeneratorTest.java	21 Nov 2007 21:55:11 -0000	1.4
***************
*** 11,14 ****
--- 11,15 ----
  import net.sf.tail.Operation;
  import net.sf.tail.OperationType;
+ import net.sf.tail.Strategy;
  import net.sf.tail.TimeSeriesSlicer;
  import net.sf.tail.Trade;
***************
*** 49,56 ****
  
  		ArrayList<Decision> decisions = new ArrayList<Decision>();
- 		Decision decision = new Decision(new FakeStrategy(new Operation[0], new Operation[0]), series,
- 				new TotalProfitCriterion(), trades, new HistoryRunner(OperationType.BUY));
- 		decisions.add(decision);
  		TimeSeriesSlicer slicer = new FullyMemorizedSlicer(series, period);
  
  		report = new Report(null,new TotalProfitCriterion(), slicer, decisions);
--- 50,59 ----
  
  		ArrayList<Decision> decisions = new ArrayList<Decision>();
  		TimeSeriesSlicer slicer = new FullyMemorizedSlicer(series, period);
+ 		Strategy strategy = new FakeStrategy(new Operation[0], new Operation[0]);
+ 		Decision decision = new Decision(strategy, slicer, 0,
+ 				new TotalProfitCriterion(), trades, new HistoryRunner(slicer, strategy));
+ 		decisions.add(decision);
+ 		
  
  		report = new Report(null,new TotalProfitCriterion(), slicer, decisions);

Index: CompleteHtmlGeneratorTest.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/test/net/sf/tails/swing/helper/CompleteHtmlGeneratorTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CompleteHtmlGeneratorTest.java	15 Oct 2007 20:23:57 -0000	1.4
--- CompleteHtmlGeneratorTest.java	21 Nov 2007 21:55:11 -0000	1.5
***************
*** 9,12 ****
--- 9,13 ----
  import net.sf.tail.Operation;
  import net.sf.tail.OperationType;
+ import net.sf.tail.Strategy;
  import net.sf.tail.TimeSeriesSlicer;
  import net.sf.tail.Trade;
***************
*** 49,58 ****
  		period = new Period().withYears(1);
  		trades.add(new Trade(new Operation(0, OperationType.BUY), new Operation(2, OperationType.SELL)));
! 
  		ArrayList<Decision> decisions = new ArrayList<Decision>();
! 		Decision decision = new Decision(new FakeStrategy(new Operation[0], new Operation[0]), series,
! 				new TotalProfitCriterion(), trades, new HistoryRunner(OperationType.BUY));
  		decisions.add(decision);
! 		TimeSeriesSlicer slicer = new FullyMemorizedSlicer(series, period);
  
  		report = new Report(null, new TotalProfitCriterion(), slicer, decisions);
--- 50,59 ----
  		period = new Period().withYears(1);
  		trades.add(new Trade(new Operation(0, OperationType.BUY), new Operation(2, OperationType.SELL)));
! 		TimeSeriesSlicer slicer = new FullyMemorizedSlicer(series, period);
  		ArrayList<Decision> decisions = new ArrayList<Decision>();
! 		Strategy strategy = new FakeStrategy(new Operation[0], new Operation[0]);
! 		Decision decision = new Decision(strategy, slicer, 0, new TotalProfitCriterion(), trades, new HistoryRunner(slicer, strategy));
  		decisions.add(decision);
! 		
  
  		report = new Report(null, new TotalProfitCriterion(), slicer, decisions);

[Tail-cvs] TailS/src/java/net/sf/tails/swing/helper CompleteReportGenerator.java, 1.11 FrameHelper.java, 1.24

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7762/src/java/net/sf/tails/swing/helper

Modified Files:
	CompleteReportGenerator.java FrameHelper.java 
Log Message:
Mega refatoração, Runner não está mais vendendo no final de cada slice

Index: FrameHelper.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper/FrameHelper.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** FrameHelper.java	31 Oct 2007 16:25:31 -0000	1.23
--- FrameHelper.java	21 Nov 2007 21:55:11 -0000	1.24
***************
*** 22,29 ****
  
  import net.sf.tail.AnalysisCriterion;
- import net.sf.tail.Runner;
  import net.sf.tail.TimeSeriesLoader;
  import net.sf.tail.analysis.StockAnalysis;
  import net.sf.tail.report.Report;
  
  import org.joda.time.DateTime;
--- 22,29 ----
  
  import net.sf.tail.AnalysisCriterion;
  import net.sf.tail.TimeSeriesLoader;
  import net.sf.tail.analysis.StockAnalysis;
  import net.sf.tail.report.Report;
+ import net.sf.tail.runner.RunnerFactory;
  
  import org.joda.time.DateTime;
***************
*** 53,63 ****
  	}
  	
! 	public Runner getSelectedRunner(String runnerName)
  	throws InstantiationException, IllegalAccessException, ClassNotFoundException {
  		Class<?> cls = Class.forName(packageBundle.getString("RUNNER_PACKAGE") + runnerName);
  		Object object = cls.newInstance();
  
! 		if (object instanceof Runner) {
! 			return (Runner) object;
  		} else
  			return null;
--- 53,63 ----
  	}
  	
! 	public RunnerFactory getSelectedRunner(String runnerName)
  	throws InstantiationException, IllegalAccessException, ClassNotFoundException {
  		Class<?> cls = Class.forName(packageBundle.getString("RUNNER_PACKAGE") + runnerName);
  		Object object = cls.newInstance();
  
! 		if (object instanceof RunnerFactory) {
! 			return (RunnerFactory) object;
  		} else
  			return null;

Index: CompleteReportGenerator.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper/CompleteReportGenerator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CompleteReportGenerator.java	12 Nov 2007 23:28:20 -0000	1.10
--- CompleteReportGenerator.java	21 Nov 2007 21:55:11 -0000	1.11
***************
*** 76,82 ****
  						JOptionPane.showMessageDialog(null, e.getMessage(), "Error", 0);
  					}
! 					finally{
! 						System.exit(0);
! 					}
  				}}).start();
  	}
--- 76,80 ----
  						JOptionPane.showMessageDialog(null, e.getMessage(), "Error", 0);
  					}
! 					
  				}}).start();
  	}
***************
*** 157,161 ****
  		long time = System.currentTimeMillis();
  		index.appendConsoleArea("Initializing image generator for " + decision.getFileName() + ".");
! 		TimeSeries timeSeries = decision.getSeries();
  		List<Indicator<? extends Number>> indicators;
  		String imagePath = chartDir + File.separatorChar + decision.getFileName() + ".png";
--- 155,159 ----
  		long time = System.currentTimeMillis();
  		index.appendConsoleArea("Initializing image generator for " + decision.getFileName() + ".");
! 		TimeSeries timeSeries = decision.getActualSlice();
  		List<Indicator<? extends Number>> indicators;
  		String imagePath = chartDir + File.separatorChar + decision.getFileName() + ".png";

[Tail-cvs] TailS/Data/templates/complete report.ftl,1.3

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/TailS/Data/templates/complete
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7762/Data/templates/complete

Modified Files:
	report.ftl 
Log Message:
Mega refatoração, Runner não está mais vendendo no final de cada slice

Index: report.ftl
===================================================================
RCS file: /cvsroot/tail/TailS/Data/templates/complete/report.ftl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** report.ftl	5 Nov 2007 18:59:42 -0000	1.2
--- report.ftl	21 Nov 2007 21:55:11 -0000	1.3
***************
*** 32,40 ****
  	<#assign x=x+1>
  		<td>${x}</td>
! 		<td class="date">${decision.series.periodName}</td>
  		<td class="strategy"><a href=${urls.get(x - 2)}>${decision.strategy.name}</a></td>
! 		<td>${report.applyedCriterion.calculate(decision.series, decision.trades)}</td>
  		<#list criterions as criterion>
! 			<td>${criterion.calculate(decision.series, decision.trades)}</td>			
  		</#list>
  	</tr>
--- 32,40 ----
  	<#assign x=x+1>
  		<td>${x}</td>
! 		<td class="date">${decision.getActualSlice().periodName}</td>
  		<td class="strategy"><a href=${urls.get(x - 2)}>${decision.strategy.name}</a></td>
! 		<td>${report.applyedCriterion.calculate(decision.getActualSlice(), decision.trades)}</td>
  		<#list criterions as criterion>
! 			<td>${criterion.calculate(decision.getActualSlice(), decision.trades)}</td>			
  		</#list>
  	</tr>

[Tail-cvs] TailS/Data/templates/slice sliceReport.ftl, 1.2 header.ftl, 1.3

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/TailS/Data/templates/slice
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7762/Data/templates/slice

Modified Files:
	sliceReport.ftl header.ftl 
Log Message:
Mega refatoração, Runner não está mais vendendo no final de cada slice

Index: sliceReport.ftl
===================================================================
RCS file: /cvsroot/tail/TailS/Data/templates/slice/sliceReport.ftl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sliceReport.ftl	10 Oct 2007 19:04:47 -0000	1.1
--- sliceReport.ftl	21 Nov 2007 21:55:11 -0000	1.2
***************
*** 22,31 ****
  			</#if>	
  				<td>${x}</td>
! 				<td class="date">${decision.series.getTick(trade.entry.index).getDateName()}</td>
! 				<td class="date">${decision.series.getTick(trade.entry.index).closePrice}</td>
! 				<td class="date">${decision.series.getTick(trade.exit.index).getDateName()}</td>
! 				<td class="date">${decision.series.getTick(trade.exit.index).closePrice}</td>
  				<#list criteria as criterion>
!  					<td> ${criterion.calculate(decision.series, decision.trades.get(x - 1))}</td>
   				</#list>
  				<#assign x=x+1>
--- 22,31 ----
  			</#if>	
  				<td>${x}</td>
! 				<td class="date">${decision.getActualSlice().getTick(trade.entry.index).getDateName()}</td>
! 				<td class="date">${decision.getActualSlice().getTick(trade.entry.index).closePrice}</td>
! 				<td class="date">${decision.getActualSlice().getTick(trade.exit.index).getDateName()}</td>
! 				<td class="date">${decision.getActualSlice().getTick(trade.exit.index).closePrice}</td>
  				<#list criteria as criterion>
!  					<td> ${criterion.calculate(decision.getActualSlice(), decision.trades.get(x - 1))}</td>
   				</#list>
  				<#assign x=x+1>
***************
*** 36,45 ****
  	<tr class="total">
  		<td>TOTAL</td>
! 		<td>${decision.series.getTick(decision.series.begin).getDateName()}</td>
  		<td>-</td>
! 		<td>${decision.series.getTick(decision.series.end).getDateName()}</td>
  		<td>-</td>
  		<#list criteria as criterion>
!  			<td>${criterion.calculate(decision.series, decision.trades)} </td>
   		</#list>
  	</tr>
--- 36,45 ----
  	<tr class="total">
  		<td>TOTAL</td>
! 		<td>${decision.getActualSlice().getTick(decision.getActualSlice().begin).getDateName()}</td>
  		<td>-</td>
! 		<td>${decision.getActualSlice().getTick(decision.getActualSlice().end).getDateName()}</td>
  		<td>-</td>
  		<#list criteria as criterion>
!  			<td>${criterion.calculate(decision.getActualSlice(), decision.trades)} </td>
   		</#list>
  	</tr>

Index: header.ftl
===================================================================
RCS file: /cvsroot/tail/TailS/Data/templates/slice/header.ftl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** header.ftl	5 Nov 2007 18:59:42 -0000	1.2
--- header.ftl	21 Nov 2007 21:55:11 -0000	1.3
***************
*** 9,13 ****
  
  <h1>Slice Report</h1>
! <h2>Stock: <span class="titleHeader">${decision.series.name} for: ${decision.series.periodName}</span></h2>
  
  <h3>
--- 9,13 ----
  
  <h1>Slice Report</h1>
! <h2>Stock: <span class="titleHeader">${decision.getActualSlice().name} for: ${decision.getActualSlice().periodName}</span></h2>
  
  <h3>

[Tail-cvs] TailS/src/java/net/sf/tails/swing/frame/stockAnalysis NewStockAnalysis3.java, 1.16

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7762/src/java/net/sf/tails/swing/frame/stockAnalysis

Modified Files:
	NewStockAnalysis3.java 
Log Message:
Mega refatoração, Runner não está mais vendendo no final de cada slice

Index: NewStockAnalysis3.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis3.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** NewStockAnalysis3.java	5 Nov 2007 17:19:39 -0000	1.15
--- NewStockAnalysis3.java	21 Nov 2007 21:55:11 -0000	1.16
***************
*** 33,37 ****
  import net.sf.tail.TimeSeriesSlicer;
  import net.sf.tail.analysis.StockAnalysis;
! import net.sf.tail.analysis.evaluator.HigherValueEvaluator;
  import net.sf.tail.series.FullyMemorizedSlicer;
  import net.sf.tail.series.PartialMemorizedSlicer;
--- 33,37 ----
  import net.sf.tail.TimeSeriesSlicer;
  import net.sf.tail.analysis.StockAnalysis;
! import net.sf.tail.analysis.evaluator.HigherValueEvaluatorFactory;
  import net.sf.tail.series.FullyMemorizedSlicer;
  import net.sf.tail.series.PartialMemorizedSlicer;
***************
*** 215,219 ****
          runnerTypeLabel.setText("Runner Type:");
  
!         runnerTypeComboBox.setModel(new DefaultComboBoxModel(new String[]{ "HistoryRunner", "ShortSellRunner" }));
          runnerTypeComboBox.setMinimumSize(new Dimension(178, 23));
          runnerTypeComboBox.setPreferredSize(new Dimension(178, 23));
--- 215,219 ----
          runnerTypeLabel.setText("Runner Type:");
  
!         runnerTypeComboBox.setModel(new DefaultComboBoxModel(new String[]{ "HistoryRunnerFactory", "ShortSellRunnerFactory" }));
          runnerTypeComboBox.setMinimumSize(new Dimension(178, 23));
          runnerTypeComboBox.setPreferredSize(new Dimension(178, 23));
***************
*** 411,415 ****
  		
  		try {
! 			stockAnalysis = new StockAnalysis(stock, selectedCriterion, slicer, new HigherValueEvaluator(helper.getSelectedRunner(runnerTypeComboBox.getSelectedItem().toString())));
  		} catch (Exception e) {
  			JOptionPane.showMessageDialog(null, messageBundle.getString("INTERNAL_ERROR"), "Error", 2);
--- 411,415 ----
  		
  		try {
! 			stockAnalysis = new StockAnalysis(stock, selectedCriterion, slicer, new HigherValueEvaluatorFactory(), helper.getSelectedRunner(runnerTypeComboBox.getSelectedItem().toString()));
  		} catch (Exception e) {
  			JOptionPane.showMessageDialog(null, messageBundle.getString("INTERNAL_ERROR"), "Error", 2);

[Tail-cvs] TailS/src/java/net/sf/tails/swing/helper CompleteReportGenerator.java, 1.10

[xanaot <xa...@us...>]

Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8820/src/java/net/sf/tails/swing/helper

Modified Files:
	CompleteReportGenerator.java 
Log Message:
build.xml e acerto na classe completeReportGenerator para finalizar o processo.

Index: CompleteReportGenerator.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper/CompleteReportGenerator.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CompleteReportGenerator.java	5 Nov 2007 18:59:42 -0000	1.9
--- CompleteReportGenerator.java	12 Nov 2007 23:28:20 -0000	1.10
***************
*** 76,80 ****
  						JOptionPane.showMessageDialog(null, e.getMessage(), "Error", 0);
  					}
! 					
  				}}).start();
  	}
--- 76,82 ----
  						JOptionPane.showMessageDialog(null, e.getMessage(), "Error", 0);
  					}
! 					finally{
! 						System.exit(0);
! 					}
  				}}).start();
  	}

[Tail-cvs] TailS build.xml,1.2

[xanaot <xa...@us...>]

Update of /cvsroot/tail/TailS
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8820

Modified Files:
	build.xml 
Log Message:
build.xml e acerto na classe completeReportGenerator para finalizar o processo.

Index: build.xml
===================================================================
RCS file: /cvsroot/tail/TailS/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build.xml	7 Nov 2007 22:20:11 -0000	1.1
--- build.xml	12 Nov 2007 23:28:20 -0000	1.2
***************
*** 6,14 ****
--- 6,19 ----
  	<property name="version" value="0.6-SNAPSHOT" />
  	<property name="lib.dir" value="lib" />
+ 	<property name="dist" value="." />
+ 	<property name="data" value="${dist}/Data" />
+ 	<property name="dsl" value="${dist}/dsl" />
  
+ 	<!-- Classpath -->
  	<path id="classpath">
  		<fileset dir="${lib.dir}" includes="**/*.jar" />
  	</path>
  
+ 	<!-- Clean -->
  	<target name="clean">
  		<delete dir="${build}" />
***************
*** 16,29 ****
  	</target>
  
  	<target name="compile" depends="clean">
  		<javac srcdir="${src}" destdir="${build}" debug="true" classpathref="classpath" />
  	</target>
  
  	<target name="jar" depends="compile">
  		<delete file="tails-${version}.jar" /> 
  		<delete file="MANIFEST.MF"/>
! 		<manifest file="MANIFEST.MF">
  		    <attribute name="Main-Class" value="net/sf/tails/swing/Main"/>
! 		    <attribute name="Class-Path" value="${lib.dir}/jfreechart-1.0.5.jar ${lib.dir}/tail-${version}.jar"/>
  		</manifest>
  		
--- 21,53 ----
  	</target>
  
+ 	<!-- Compile -->
  	<target name="compile" depends="clean">
  		<javac srcdir="${src}" destdir="${build}" debug="true" classpathref="classpath" />
  	</target>
  
+ 	<!-- Jar -->
  	<target name="jar" depends="compile">
  		<delete file="tails-${version}.jar" /> 
  		<delete file="MANIFEST.MF"/>
! 		
! 		<!-- classpath para o MANIFEST.MF -->
! 		  <pathconvert property="libs.project" pathsep=" ">
! 		    <mapper>
! 		      <chainedmapper>
! 		        <flattenmapper />
! 		        <globmapper from="*" to="lib/*" />
! 		      </chainedmapper>
! 		    </mapper>
! 		    <path>
! 		      <fileset dir="${lib.dir}">
! 		        <include name="**/*.jar" />
! 		      </fileset>
! 		    </path>
! 		  </pathconvert>
! 			
! 		<!-- MANIFEST.MF -->			
! 		<manifest file="MANIFEST.MF" >
  		    <attribute name="Main-Class" value="net/sf/tails/swing/Main"/>
! 		    <attribute name="Class-Path" value="${libs.project}"/>
  		</manifest>
  		
***************
*** 32,36 ****
  		</jar>
  	</target>
! 	
  	<target name="run" depends="jar">
  		<java classname="net.sf.tails.swing.Main" classpath="tails-${version}.jar" fork="true">
--- 56,60 ----
  		</jar>
  	</target>
! 	<!--
  	<target name="run" depends="jar">
  		<java classname="net.sf.tails.swing.Main" classpath="tails-${version}.jar" fork="true">
***************
*** 40,44 ****
  			</classpath>
  		</java>
! 	</target>
  
  </project>
\ No newline at end of file
--- 64,77 ----
  			</classpath>
  		</java>
! 	</target>-->
  
+ 	<target name="zip" depends="jar">
+ 		<zip destfile="${dist}/tails-${version}.zip">
+ 			<zipfileset dir="${lib.dir}" prefix="lib/"></zipfileset>
+ 			<zipfileset dir="${dist}" includes="tails-${version}.jar"></zipfileset>
+ 			<zipfileset dir="${data}" prefix="Data/"></zipfileset>
+ 			<zipfileset dir="${dsl}" prefix="dsl/"></zipfileset>
+ 		</zip>
+ 	</target>
+ 	
  </project>
\ No newline at end of file

[Tail-cvs] TailS/src/java/net/sf/tails/swing/frame Index.java, 1.50

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6015/src/java/net/sf/tails/swing/frame

Modified Files:
	Index.java 
Log Message:
colocando ultima versao...

Index: Index.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/Index.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** Index.java	12 Nov 2007 21:32:23 -0000	1.49
--- Index.java	12 Nov 2007 22:13:45 -0000	1.50
***************
*** 733,737 ****
  	protected void helpButtonActionPerformed(ActionEvent evt) {
  		String osName = System.getProperty("os.name"); 
! 		String url = "http://tail.cvs.sourceforge.net/*checkout*/tail/TailS/Data/Help/TailSHelp.html?revision=1.1#Runner";
  		
  		try { 
--- 733,737 ----
  	protected void helpButtonActionPerformed(ActionEvent evt) {
  		String osName = System.getProperty("os.name"); 
! 		String url = "http://tail.cvs.sourceforge.net/*checkout*/tail/TailS/Data/Help/TailSHelp.html?revision=1.3#Runner";
  		
  		try { 

[Tail-cvs] TailS/Data/Help/TailSHelp_images dc6sqns7_41f3vd4nfn.bmp, 1.1 dc6sqns7_36dwzbbwd6.bmp, 1.1 dc6sqns7_33gv64rzgd.bmp, 1.1 dc6sqns7_26f9zn36g8.bmp, 1.1 dc6sqns7_399h3mbzgw.bmp, 1.1 dc6sqns7_25hfz38jg8.bmp, 1.1 dc6sqns7_27dwk2jbgc.bmp, 1.1 dc6sqns7_34hhqj9shq.bmp, 1.1 dc6sqns7_32dzpbv2c2.bmp, 1.1 dc6sqns7_35hqvvggdn.bmp, 1.1 dc6sqns7_40fhktvssw.bmp, 1.1 dc6sqns7_24dw2tdrcq.bmp, 1.1 dc6sqns7_30c9cr7thg.bmp, 1.1 dc6sqns7_26f9zn36g8.gif, NONE dc6sqns7_32dzpbv2c2.gif, NONE dc6sqns7_36dwzbbwd6.gif, NONE dc6sqns7_27dwk2jbgc.gif, NONE dc6sqns7_34hhqj9shq.gif, NONE dc6sqns7_33gv64rzgd.gif, NONE dc6sqns7_25hfz38jg8.gif, NONE dc6sqns7_30c9cr7thg.gif, NONE dc6sqns7_24dw2tdrcq.gif, NONE dc6sqns7_35hqvvggdn.gif, NONE

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/TailS/Data/Help/TailSHelp_images
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32340/Data/Help/TailSHelp_images

Added Files:
	dc6sqns7_41f3vd4nfn.bmp dc6sqns7_36dwzbbwd6.bmp 
	dc6sqns7_33gv64rzgd.bmp dc6sqns7_26f9zn36g8.bmp 
	dc6sqns7_399h3mbzgw.bmp dc6sqns7_25hfz38jg8.bmp 
	dc6sqns7_27dwk2jbgc.bmp dc6sqns7_34hhqj9shq.bmp 
	dc6sqns7_32dzpbv2c2.bmp dc6sqns7_35hqvvggdn.bmp 
	dc6sqns7_40fhktvssw.bmp dc6sqns7_24dw2tdrcq.bmp 
	dc6sqns7_30c9cr7thg.bmp 
Removed Files:
	dc6sqns7_26f9zn36g8.gif dc6sqns7_32dzpbv2c2.gif 
	dc6sqns7_36dwzbbwd6.gif dc6sqns7_27dwk2jbgc.gif 
	dc6sqns7_34hhqj9shq.gif dc6sqns7_33gv64rzgd.gif 
	dc6sqns7_25hfz38jg8.gif dc6sqns7_30c9cr7thg.gif 
	dc6sqns7_24dw2tdrcq.gif dc6sqns7_35hqvvggdn.gif 
Log Message:
nova versao do help.

--- NEW FILE: dc6sqns7_30c9cr7thg.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: dc6sqns7_33gv64rzgd.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: dc6sqns7_34hhqj9shq.bmp ---
(This appears to be a binary file; contents omitted.)

--- dc6sqns7_30c9cr7thg.gif DELETED ---

--- NEW FILE: dc6sqns7_32dzpbv2c2.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: dc6sqns7_35hqvvggdn.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: dc6sqns7_27dwk2jbgc.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: dc6sqns7_41f3vd4nfn.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: dc6sqns7_399h3mbzgw.bmp ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: dc6sqns7_26f9zn36g8.bmp ---
(This appears to be a binary file; contents omitted.)

--- dc6sqns7_33gv64rzgd.gif DELETED ---

--- NEW FILE: dc6sqns7_40fhktvssw.bmp ---
(This appears to be a binary file; contents omitted.)

--- dc6sqns7_27dwk2jbgc.gif DELETED ---

--- dc6sqns7_26f9zn36g8.gif DELETED ---

--- NEW FILE: dc6sqns7_25hfz38jg8.bmp ---
(This appears to be a binary file; contents omitted.)

--- dc6sqns7_36dwzbbwd6.gif DELETED ---

--- dc6sqns7_34hhqj9shq.gif DELETED ---

--- NEW FILE: dc6sqns7_36dwzbbwd6.bmp ---
(This appears to be a binary file; contents omitted.)

--- dc6sqns7_25hfz38jg8.gif DELETED ---

--- NEW FILE: dc6sqns7_24dw2tdrcq.bmp ---
(This appears to be a binary file; contents omitted.)

--- dc6sqns7_24dw2tdrcq.gif DELETED ---

--- dc6sqns7_32dzpbv2c2.gif DELETED ---

--- dc6sqns7_35hqvvggdn.gif DELETED ---

[Tail-cvs] TailS/Data/Help TailSHelp.html,1.3

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/TailS/Data/Help
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32340/Data/Help

Modified Files:
	TailSHelp.html 
Log Message:
nova versao do help.

Index: TailSHelp.html
===================================================================
RCS file: /cvsroot/tail/TailS/Data/Help/TailSHelp.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TailSHelp.html	12 Nov 2007 21:32:23 -0000	1.2
--- TailSHelp.html	12 Nov 2007 22:02:33 -0000	1.3
***************
*** 5,8 ****
--- 5,9 ----
  
  <style>
+ 
  BODY, P, DIV, H1, H2, H3, H4, H5, H6, ADDRESS, OL, UL, TITLE, TD, OPTION, SELECT {
   font-family: Verdana;
***************
*** 44,47 ****
--- 45,49 ----
  
  
+ 
  </style>
  
***************
*** 52,56 ****
  
  
! <body revision="dc6sqns7_21fc3szb:197">
  
  <h2>
--- 54,58 ----
  
  
! <body revision="dc6sqns7_21fc3szb:231">
  
  <h2>
***************
*** 102,106 ****
  <br>
  <div id=a0e: style="PADDING:1em 0pt; TEXT-ALIGN:left">
!   <img src="TailSHelp_images/dc6sqns7_24dw2tdrcq.gif" style="WIDTH:640px; HEIGHT:400px">
  </div>
  <br>
--- 104,108 ----
  <br>
  <div id=a0e: style="PADDING:1em 0pt; TEXT-ALIGN:left">
!   <img src=TailSHelp_images/dc6sqns7_24dw2tdrcq.bmp style="WIDTH:640px; HEIGHT:400px">
  </div>
  <br>
***************
*** 141,147 ****
    Clique no botão <b>New
    Report...</b><img src=TailSHelp_images/dc6sqns7_288rzv8gr.gif style="WIDTH:16px; HEIGHT:16px"><br>
    <div id=tj:n style="PADDING:1em 0pt; TEXT-ALIGN:left">
      <div id=kkhl style="PADDING:1em 0pt; TEXT-ALIGN:left">
!       <img src=TailSHelp_images/dc6sqns7_30c9cr7thg.gif style="WIDTH:799px; HEIGHT:277px">
      </div>
    </div>
--- 143,166 ----
    Clique no botão <b>New
    Report...</b><img src=TailSHelp_images/dc6sqns7_288rzv8gr.gif style="WIDTH:16px; HEIGHT:16px"><br>
+   Existem dois modos de se criar reports:
+   <a href=#Criando_reports_automaticamente id=ueei title=automaticamente>automaticamente</a>
+   ou
+   <a href=#Criando_Reports_Manualmente id=f-pa title=manualmente>manualmente</a>.<br>
+   <br>
+   <h3>
+     <a id=ujtb name=Criando_reports_automaticamente></a>Criando reports
+     automaticamente
+   </h3>
+   O TailS fornece algumas implementações dos reports mais comuns, entretanto a
+   possibilidade de customizar reports, ou até mesmo criar novos reports somente
+   é possível na
+   <a href=#Criando_Reports_Manualmente id=atr_ title="criação manual de reports">criação
+   manual de reports</a>.<br>
+   Para criar reports automaticamente:<br>
+   Clique na aba <b>Default Report</b><br>
+   <br>
    <div id=tj:n style="PADDING:1em 0pt; TEXT-ALIGN:left">
      <div id=kkhl style="PADDING:1em 0pt; TEXT-ALIGN:left">
!       <img src=TailSHelp_images/dc6sqns7_30c9cr7thg.bmp style="WIDTH:799px; HEIGHT:277px">
      </div>
    </div>
***************
*** 156,159 ****
--- 175,213 ----
    </b>
    <h3>
+     <a id=r7i: name=Criando_Reports_Manualmente></a><b>Criando Reports
+     Manualmente</b>
+   </h3>
+   O TailS fornece uma S.D.L. (specified definition language) baseada em código
+   ruby para facilitar o desenvolvimento de novos reports.<br>
+   Clique na aba <b>Custom Report.<br>
+   </b>
+   <div id=dz7s style="PADDING:1em 0pt; TEXT-ALIGN:left">
+     <img src=TailSHelp_images/dc6sqns7_399h3mbzgw.bmp style="WIDTH:800px; HEIGHT:408px"><br>
+     Dentro da aba existe uma interface para criação de reports, permitindo
+     salvar scripts de reports e abrir scripts de reports.<br>
+     Você também pode utilizar o
+     <a href=#Auto_complete id=eqpn title=auto-complete>auto-complete</a> para
+     acessar a lista de comandos ou o
+     <a href=#Code_Snippet id=tpsk title="code snippet">code snippet</a> para
+     pegar códigos completos de reports implementados.<br>
+     Depois de terminado o seu script clique no botão <b>Create</b> para gerar
+     seu report.<br>
+     <br>
+     <a id=eyja name=Auto_complete></a><b><u>Auto complete<br>
+     </u></b>Existe uma lista com todos os métodos para invocação de indicadores
+     e estratégias, para ter acesso a essa lista tecle <b>Ctrl+espaço</b>.<br>
+     <div id=f-ri style="PADDING:1em 0pt; TEXT-ALIGN:left">
+       <img src=TailSHelp_images/dc6sqns7_40fhktvssw.bmp style="WIDTH:790px; HEIGHT:296px"><br>
+       <br>
+       <a id=o440 name=Code_Snippet></a><b><u>Code Snippet</u></b><br>
+       Existem versões em script ruby de todos os reports default, para ter
+       acesso a lista de scripts tecle <b>Ctrl+1.<br>
+       </b>
+       <div id=af8q style="PADDING:1em 0pt; TEXT-ALIGN:left">
+         <img src=TailSHelp_images/dc6sqns7_41f3vd4nfn.bmp style="WIDTH:658px; HEIGHT:309px">
+       </div>
+     </div>
+   </div>
+   <h3>
      <a id=b6hu name=Analisando_os_resultados_obtidos></a><b>Analisando os
      resultados obtidos</b>
***************
*** 164,168 ****
    <font color=#ff0000><b><u>Aba de informações</u></b></font>.<br>
    <div id=mx43 style="PADDING:1em 0pt; TEXT-ALIGN:left">
!     <img src=TailSHelp_images/dc6sqns7_34hhqj9shq.gif style="WIDTH:848px; HEIGHT:523px">
    </div>
    <br>
--- 218,222 ----
    <font color=#ff0000><b><u>Aba de informações</u></b></font>.<br>
    <div id=mx43 style="PADDING:1em 0pt; TEXT-ALIGN:left">
!     <img src=TailSHelp_images/dc6sqns7_34hhqj9shq.bmp style="WIDTH:848px; HEIGHT:523px">
    </div>
    <br>
***************
*** 173,177 ****
    da série temporal carregada.<br>
    <div id=rt5h style="PADDING:1em 0pt; TEXT-ALIGN:left">
!     <img src=TailSHelp_images/dc6sqns7_33gv64rzgd.gif style="WIDTH:830px; HEIGHT:186px">
    </div>
    <br>
--- 227,231 ----
    da série temporal carregada.<br>
    <div id=rt5h style="PADDING:1em 0pt; TEXT-ALIGN:left">
!     <img src=TailSHelp_images/dc6sqns7_33gv64rzgd.bmp style="WIDTH:830px; HEIGHT:186px">
    </div>
    <br>
***************
*** 179,183 ****
    aplicado de todos os reports criados para a respectiva análise.<br>
    <div id=lgbw style="PADDING:1em 0pt; TEXT-ALIGN:left">
!     <img src=TailSHelp_images/dc6sqns7_32dzpbv2c2.gif style="WIDTH:828px; HEIGHT:186px">
    </div>
    <a id=slg2 name=Tabela_de_Reports></a><b><u>Tabela de Reports<br>
--- 233,237 ----
    aplicado de todos os reports criados para a respectiva análise.<br>
    <div id=lgbw style="PADDING:1em 0pt; TEXT-ALIGN:left">
!     <img src=TailSHelp_images/dc6sqns7_32dzpbv2c2.bmp style="WIDTH:828px; HEIGHT:186px">
    </div>
    <a id=slg2 name=Tabela_de_Reports></a><b><u>Tabela de Reports<br>
***************
*** 186,190 ****
    reorganizados.<br>
    <div id=u-d9 style="PADDING:1em 0pt; TEXT-ALIGN:left">
!     <img src=TailSHelp_images/dc6sqns7_35hqvvggdn.gif style="WIDTH:833px; HEIGHT:122px"><br>
    </div>
    <u><b><b><u>Aba de Informações<br>
--- 240,244 ----
    reorganizados.<br>
    <div id=u-d9 style="PADDING:1em 0pt; TEXT-ALIGN:left">
!     <img src=TailSHelp_images/dc6sqns7_35hqvvggdn.bmp style="WIDTH:833px; HEIGHT:122px"><br>
    </div>
    <u><b><b><u>Aba de Informações<br>
***************
*** 195,199 ****
    executada.<br>
    <div id=jiwi style="PADDING:1em 0pt; TEXT-ALIGN:left">
!     <img src=TailSHelp_images/dc6sqns7_36dwzbbwd6.gif style="WIDTH:833px; HEIGHT:129px">
    </div>
    <h3>
--- 249,253 ----
    executada.<br>
    <div id=jiwi style="PADDING:1em 0pt; TEXT-ALIGN:left">
!     <img src=TailSHelp_images/dc6sqns7_36dwzbbwd6.bmp style="WIDTH:833px; HEIGHT:129px">
    </div>
    <h3>
***************
*** 220,223 ****
--- 274,281 ----
    <h3>
    </h3>
+   <h3>
+     <a id=wxa1 name=Carregando_uma_série_temporal_de></a>
+   </h3>
+   <br>
    <br>
    <h3>
***************
*** 236,240 ****
  No campo <b>Series Format</b> escolha o formato que do seu arquivo CSV<br>
  <div id=nl-d style="PADDING:1em 0pt; TEXT-ALIGN:left">
!   <img src=TailSHelp_images/dc6sqns7_25hfz38jg8.gif style="WIDTH:613px; HEIGHT:352px">
  </div>
  Aperte o botão <b>Next</b>, e pronto ! Está criado o seu Stock<br>
--- 294,298 ----
  No campo <b>Series Format</b> escolha o formato que do seu arquivo CSV<br>
  <div id=nl-d style="PADDING:1em 0pt; TEXT-ALIGN:left">
!   <img src=TailSHelp_images/dc6sqns7_25hfz38jg8.bmp style="WIDTH:613px; HEIGHT:352px">
  </div>
  Aperte o botão <b>Next</b>, e pronto ! Está criado o seu Stock<br>
***************
*** 245,249 ****
  <br>
  <div id=jz0q style="PADDING:1em 0pt; TEXT-ALIGN:left">
!   <img src=TailSHelp_images/dc6sqns7_26f9zn36g8.gif style="WIDTH:640px; HEIGHT:402px">
  </div>
  O critério de comparação é o modo de escolher a melhor de duas estratégias de
--- 303,307 ----
  <br>
  <div id=jz0q style="PADDING:1em 0pt; TEXT-ALIGN:left">
!   <img src=TailSHelp_images/dc6sqns7_26f9zn36g8.bmp style="WIDTH:640px; HEIGHT:402px">
  </div>
  O critério de comparação é o modo de escolher a melhor de duas estratégias de
***************
*** 285,289 ****
  </h3>
  <div id=fd4i style="PADDING:1em 0pt; TEXT-ALIGN:left">
!   <img src=TailSHelp_images/dc6sqns7_27dwk2jbgc.gif style="WIDTH:642px; HEIGHT:401px">
  </div>
  O tipo de Slicer determina o modo em que a série temporal será sub-dividida.<br>
--- 343,347 ----
  </h3>
  <div id=fd4i style="PADDING:1em 0pt; TEXT-ALIGN:left">
!   <img src=TailSHelp_images/dc6sqns7_27dwk2jbgc.bmp style="WIDTH:642px; HEIGHT:401px">
  </div>
  O tipo de Slicer determina o modo em que a série temporal será sub-dividida.<br>

[Tail-cvs] TailS .classpath,1.19

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/TailS
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25221

Modified Files:
	.classpath 
Log Message:
classpath usando o tail no tails

Index: .classpath
===================================================================
RCS file: /cvsroot/tail/TailS/.classpath,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** .classpath	7 Nov 2007 23:26:30 -0000	1.18
--- .classpath	12 Nov 2007 21:48:01 -0000	1.19
***************
*** 14,18 ****
  	<classpathentry kind="lib" path="lib/xstream-1.2.2.jar"/>
  	<classpathentry kind="lib" path="lib/javacsv.jar"/>
- 	<classpathentry kind="lib" path="lib/tail-0.6-SNAPSHOT.jar"/>
  	<classpathentry kind="lib" path="lib/xpp3_min-1.1.3.4.O.jar"/>
  	<classpathentry kind="lib" path="lib/jruby.jar"/>
--- 14,17 ----
***************
*** 31,34 ****
--- 30,34 ----
  	<classpathentry kind="lib" path="lib/jython-engine-1.0-jdk14.jar"/>
  	<classpathentry kind="src" path="dsl"/>
+ 	<classpathentry combineaccessrules="false" kind="src" path="/Tail"/>
  	<classpathentry kind="output" path="bin"/>
  </classpath>

[Tail-cvs] TailS/src/java/net/sf/tails/swing/helper HelpFrame.java, 1.2

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17613/src/java/net/sf/tails/swing/helper

Modified Files:
	HelpFrame.java 
Log Message:
Ajustando erros relativos ao help.

Index: HelpFrame.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper/HelpFrame.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HelpFrame.java	5 Nov 2007 23:20:11 -0000	1.1
--- HelpFrame.java	12 Nov 2007 21:32:23 -0000	1.2
***************
*** 8,12 ****
  
  import java.awt.Toolkit;
- import java.net.URL;
  import java.util.ResourceBundle;
  
--- 8,11 ----
***************
*** 40,44 ****
  			//jEditorPane1.setPage("file:////"+file.getAbsolutePath());
  			this.setIconImage(new ImageIcon(iconBundle.getString("TAILS_ICON")).getImage());
! 			jEditorPane1.setPage(new URL("http://tail.cvs.sourceforge.net/*checkout*/tail/TailS/Data/Help/TailSHelp.html?revision=1.1#Runner"));
  		}catch(Exception e){
  			e.printStackTrace();
--- 39,44 ----
  			//jEditorPane1.setPage("file:////"+file.getAbsolutePath());
  			this.setIconImage(new ImageIcon(iconBundle.getString("TAILS_ICON")).getImage());
! 			this.setTitle("TailS - Help Contents");
! 			jEditorPane1.setPage("http://tail.cvs.sourceforge.net/*checkout*/tail/TailS/Data/Help/TailSHelp.html?revision=1.1#Runner");
  		}catch(Exception e){
  			e.printStackTrace();

[Tail-cvs] TailS/src/java/net/sf/tails/swing/frame Index.java, 1.49

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17613/src/java/net/sf/tails/swing/frame

Modified Files:
	Index.java 
Log Message:
Ajustando erros relativos ao help.

Index: Index.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/Index.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** Index.java	5 Nov 2007 23:20:11 -0000	1.48
--- Index.java	12 Nov 2007 21:32:23 -0000	1.49
***************
*** 25,28 ****
--- 25,29 ----
  import java.io.OutputStream;
  import java.io.PrintWriter;
+ import java.lang.reflect.Method;
  import java.util.ResourceBundle;
  
***************
*** 62,66 ****
  import net.sf.tails.swing.helper.CompleteReportGenerator;
  import net.sf.tails.swing.helper.FrameHelper;
- import net.sf.tails.swing.helper.HelpFrame;
  
  import org.jfree.chart.ChartPanel;
--- 63,66 ----
***************
*** 730,736 ****
  	}
  
  	protected void helpButtonActionPerformed(ActionEvent evt) {
! 		new HelpFrame().setVisible(true);
  		
  	}
  
--- 730,763 ----
  	}
  
+ 	@SuppressWarnings("unchecked")
  	protected void helpButtonActionPerformed(ActionEvent evt) {
! 		String osName = System.getProperty("os.name"); 
! 		String url = "http://tail.cvs.sourceforge.net/*checkout*/tail/TailS/Data/Help/TailSHelp.html?revision=1.1#Runner";
  		
+ 		try { 
+ 			if (osName.startsWith("Mac OS")) { 
+ 				Class fileMgr = Class.forName("com.apple.eio.FileManager"); 
+ 				Method openURL = fileMgr.getDeclaredMethod("openURL", new Class[] {String.class}); 
+ 				openURL.invoke(null, new Object[] {url}); 
+ 			} 
+ 			else if (osName.startsWith("Windows"))  {
+ 				Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + url); 
+ 			}
+ 			else { 
+ 				//Unix ou Linux
+ 				String[] browsers = { "firefox", "opera", "konqueror", "epiphany", "mozilla", "netscape" }; 
+ 				String browser = null; 
+ 				for (int count = 0; count < browsers.length && browser == null; count++) 
+ 				{
+ 					if (Runtime.getRuntime().exec( new String[] {"which", browsers[count]}).waitFor() == 0) browser = browsers[count]; 
+ 				}
+ 				if (browser == null) 
+ 					JOptionPane.showMessageDialog(null, messageBundle.getString("LINUX"), "Error", 0);
+ 				else Runtime.getRuntime().exec(new String[] {browser, url}); 
+ 				} 
+ 			} 
+ 		catch (Exception e) { 
+ 			JOptionPane.showMessageDialog(null, messageBundle.getString("MAC_WIN_LINUX"), "Error", 0);
+ 		} 
  	}
  

[Tail-cvs] TailS/src/java/net/sf/tails/i18n Messages.properties, 1.9

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/TailS/src/java/net/sf/tails/i18n
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17613/src/java/net/sf/tails/i18n

Modified Files:
	Messages.properties 
Log Message:
Ajustando erros relativos ao help.

Index: Messages.properties
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/i18n/Messages.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Messages.properties	31 Oct 2007 21:55:02 -0000	1.8
--- Messages.properties	12 Nov 2007 21:32:23 -0000	1.9
***************
*** 25,27 ****
  SAME_REPORT_NAME =This report name already exists, please enter another one.
  NODEFAULT_SELECTED =Please select one default strategy.
! INVALID_CUSTOM =Invalid code.
\ No newline at end of file
--- 25,29 ----
  SAME_REPORT_NAME =This report name already exists, please enter another one.
  NODEFAULT_SELECTED =Please select one default strategy.
! INVALID_CUSTOM =Invalid code.
! LINUX =Web browser not found, could not open help page. Please open this url on your navigator: http://tail.cvs.sourceforge.net/*checkout*/tail/TailS/Data/Help/TailSHelp.html?revision=1.1#Runner
! MAC_WIN_LINUX =Could not open help page, please open this url on your navigator: http://tail.cvs.sourceforge.net/*checkout*/tail/TailS/Data/Help/TailSHelp.html?revision=1.1#Runner
\ No newline at end of file

[Tail-cvs] TailS/Data/Help TailSHelp.html,1.2

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/TailS/Data/Help
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17613/Data/Help

Modified Files:
	TailSHelp.html 
Log Message:
Ajustando erros relativos ao help.

Index: TailSHelp.html
===================================================================
RCS file: /cvsroot/tail/TailS/Data/Help/TailSHelp.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TailSHelp.html	31 Oct 2007 17:43:20 -0000	1.1
--- TailSHelp.html	12 Nov 2007 21:32:23 -0000	1.2
***************
*** 1,4 ****
--- 1,5 ----
  
  <head>
+ <title>TailS - Help Contents</title>
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
  
***************
*** 101,105 ****
  <br>
  <div id=a0e: style="PADDING:1em 0pt; TEXT-ALIGN:left">
!   <img src="file:\\D:\workspace\TailS\Data\Help\TailSHelp_images/dc6sqns7_24dw2tdrcq.gif" style="WIDTH:640px; HEIGHT:400px">
  </div>
  <br>
--- 102,106 ----
  <br>
  <div id=a0e: style="PADDING:1em 0pt; TEXT-ALIGN:left">
!   <img src="TailSHelp_images/dc6sqns7_24dw2tdrcq.gif" style="WIDTH:640px; HEIGHT:400px">
  </div>
  <br>
***************
*** 219,226 ****
    <h3>
    </h3>
-   <h3>
-     <a id=wxa1 name=Carregando_uma_série_temporal_de></a>
-   </h3>
-   <br>
    <br>
    <h3>
--- 220,223 ----

[Tail-cvs] Tail/src/java/net/sf/tail/report/html ReportHTMLGenerator.java, 1.3

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/java/net/sf/tail/report/html
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17179/src/java/net/sf/tail/report/html

Modified Files:
	ReportHTMLGenerator.java 
Log Message:
Ajustando erro de report em html pra windows.

Index: ReportHTMLGenerator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/html/ReportHTMLGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ReportHTMLGenerator.java	22 Oct 2007 22:56:25 -0000	1.2
--- ReportHTMLGenerator.java	12 Nov 2007 21:31:47 -0000	1.3
***************
*** 39,42 ****
--- 39,47 ----
  			throws IOException {
  		Configuration cfg = loadConfigurationDir(COMPLETE_TEMPLATE_DIR);
+ 		String adjustOSURL = "";
+ 		if (System.getProperty("os.name").toUpperCase().contains("WINDOWS"))
+ 		{
+ 			adjustOSURL =  "file:///";
+ 		}
  
  		Map<String, Object> map = new HashMap<String, Object>();
***************
*** 47,55 ****
  		List<String> stringUrl = new ArrayList<String>();
  		for (String string : urls) {
! 			stringUrl.add(string.replace(" ", "%20"));
  		} 
  			  
  		map.put("urls", stringUrl);
! 		map.put("image", imagePath.replace(" ", "%20"));
  
  		FreemarkerProcessor processor = new FreemarkerProcessor(cfg);
--- 52,61 ----
  		List<String> stringUrl = new ArrayList<String>();
  		for (String string : urls) {
! 			String newUrl = adjustOSURL + string.replace(" ", "%20");
! 			stringUrl.add(newUrl);
  		} 
  			  
  		map.put("urls", stringUrl);
! 		map.put("image", adjustOSURL + imagePath.replace(" ", "%20"));
  
  		FreemarkerProcessor processor = new FreemarkerProcessor(cfg);
***************
*** 60,69 ****
  			throws IOException {
  		Configuration cfg = loadConfigurationDir(SLICE_TEMPLATE_DIR);
! 
  		Map<String, Object> map = new HashMap<String, Object>();
  
  		map.put("decision", decision);
  		map.put("criteria", criteria);
! 		map.put("image",  imagePath.replace(" ", "%20"));
  
  		FreemarkerProcessor processor = new FreemarkerProcessor(cfg);
--- 66,80 ----
  			throws IOException {
  		Configuration cfg = loadConfigurationDir(SLICE_TEMPLATE_DIR);
! 		String adjustOSURL = "";
! 		if (System.getProperty("os.name").toUpperCase().contains("WINDOWS"))
! 		{
! 			adjustOSURL =  "file:///";
! 		}
! 		
  		Map<String, Object> map = new HashMap<String, Object>();
  
  		map.put("decision", decision);
  		map.put("criteria", criteria);
! 		map.put("image", adjustOSURL + imagePath.replace(" ", "%20"));
  
  		FreemarkerProcessor processor = new FreemarkerProcessor(cfg);
***************
*** 73,82 ****
  	public StringBuffer generate(Report report, List<AnalysisCriterion> criterion, String imagePath) throws IOException {
  		Configuration cfg = loadConfigurationDir(DEFAULT_TEMPLATE_DIR);
! 
  		Map<String, Object> map = new HashMap<String, Object>();
  
  		map.put("report", report);
  		map.put("criterions", criterion);
! 		map.put("image",  imagePath.replace(" ", "%20"));
  
  		FreemarkerProcessor processor = new FreemarkerProcessor(cfg);
--- 84,98 ----
  	public StringBuffer generate(Report report, List<AnalysisCriterion> criterion, String imagePath) throws IOException {
  		Configuration cfg = loadConfigurationDir(DEFAULT_TEMPLATE_DIR);
! 		String adjustOSURL = "";
! 		if (System.getProperty("os.name").toUpperCase().contains("WINDOWS"))
! 		{
! 			adjustOSURL =  "file:///";
! 		}
! 		
  		Map<String, Object> map = new HashMap<String, Object>();
  
  		map.put("report", report);
  		map.put("criterions", criterion);
! 		map.put("image", adjustOSURL + imagePath.replace(" ", "%20"));
  
  		FreemarkerProcessor processor = new FreemarkerProcessor(cfg);

[Tail-cvs] Tail/src/java/net/sf/tail/report/xls ReportXlsGenerator.java, 1.15 SliceXlsGenerator.java, 1.16

[xanaot <xa...@us...>]

Update of /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21717/src/java/net/sf/tail/report/xls

Modified Files:
	ReportXlsGenerator.java SliceXlsGenerator.java 
Log Message:
ajustes de erros no xls.

Index: SliceXlsGenerator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/SliceXlsGenerator.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** SliceXlsGenerator.java	12 Nov 2007 18:49:40 -0000	1.15
--- SliceXlsGenerator.java	12 Nov 2007 19:26:01 -0000	1.16
***************
*** 172,176 ****
  		long time = System.currentTimeMillis();
  		double calculate;
! 		int index = firtRow - 23;
  		for (Trade trade : decision.getTrades()) {
  			int i = 0;
--- 172,176 ----
  		long time = System.currentTimeMillis();
  		double calculate;
! 		int index = firtRow - 24;
  		for (Trade trade : decision.getTrades()) {
  			int i = 0;

Index: ReportXlsGenerator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/ReportXlsGenerator.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ReportXlsGenerator.java	12 Nov 2007 18:49:40 -0000	1.14
--- ReportXlsGenerator.java	12 Nov 2007 19:26:01 -0000	1.15
***************
*** 158,162 ****
  		indexcolumn = 1;
  
! 		createCell(rowFirst, (firtRow - INDEX_FIRST_ROW - 1), (short) indexcolumn++, style);
  		createCell(rowFirst, report.getSlicer().getSlice(0).getTick(report.getSlicer().getSlice(0).getBegin())
  				.getDateName(), (short) indexcolumn++, style);
--- 158,162 ----
  		indexcolumn = 1;
  
! 		createCell(rowFirst, (firtRow - 25), (short) indexcolumn++, style);
  		createCell(rowFirst, report.getSlicer().getSlice(0).getTick(report.getSlicer().getSlice(0).getBegin())
  				.getDateName(), (short) indexcolumn++, style);
***************
*** 179,183 ****
  		long time = System.currentTimeMillis();
  		double calculate;
! 		int index = firtRow - 23;
  		for (Decision decision : report.getDecisions()) {
  			if (even) {
--- 179,183 ----
  		long time = System.currentTimeMillis();
  		double calculate;
! 		int index = firtRow - 24;
  		for (Decision decision : report.getDecisions()) {
  			if (even) {

[Tail-cvs] Tail/src/java/net/sf/tail/report/xls ReportXlsGenerator.java, 1.14 SliceXlsGenerator.java, 1.15

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5535/src/java/net/sf/tail/report/xls

Modified Files:
	ReportXlsGenerator.java SliceXlsGenerator.java 
Log Message:
ajustes de detalhes

Index: SliceXlsGenerator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/SliceXlsGenerator.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** SliceXlsGenerator.java	6 Nov 2007 14:10:31 -0000	1.14
--- SliceXlsGenerator.java	12 Nov 2007 18:49:40 -0000	1.15
***************
*** 172,176 ****
  		long time = System.currentTimeMillis();
  		double calculate;
! 		int index = firtRow - INDEX_FIRST_ROW;
  		for (Trade trade : decision.getTrades()) {
  			int i = 0;
--- 172,176 ----
  		long time = System.currentTimeMillis();
  		double calculate;
! 		int index = firtRow - 23;
  		for (Trade trade : decision.getTrades()) {
  			int i = 0;
***************
*** 204,208 ****
  			}
  			for (AnalysisCriterion criterium : criteria) {
! 				calculate = criterium.calculate(decision.getSeries(), decision.getTrades().get(i));
  				createCell(rowDecision, calculate, (short) indexcolumn++, style);
  			}
--- 204,208 ----
  			}
  			for (AnalysisCriterion criterium : criteria) {
! 				calculate = criterium.calculate(decision.getSeries(), trade);
  				createCell(rowDecision, calculate, (short) indexcolumn++, style);
  			}

Index: ReportXlsGenerator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/ReportXlsGenerator.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ReportXlsGenerator.java	5 Nov 2007 23:25:59 -0000	1.13
--- ReportXlsGenerator.java	12 Nov 2007 18:49:40 -0000	1.14
***************
*** 179,183 ****
  		long time = System.currentTimeMillis();
  		double calculate;
! 		int index = firtRow - INDEX_FIRST_ROW;
  		for (Decision decision : report.getDecisions()) {
  			if (even) {
--- 179,183 ----
  		long time = System.currentTimeMillis();
  		double calculate;
! 		int index = firtRow - 23;
  		for (Decision decision : report.getDecisions()) {
  			if (even) {

[Tail-cvs] Tail/src/test/net/sf/tail/graphics CashFlowDatasetTest.java, 1.7 SeriesDatasetTest.java, 1.10 FasterCriteriaDatasetTest.java, 1.2 StockAndCashFlowDatasetTest.java, 1.5 CriteriaDatasetTest.java, 1.6 FasterDatasetTest.java, 1.4

[Carlos <ma...@us...>]

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

Modified Files:
	CashFlowDatasetTest.java SeriesDatasetTest.java 
	FasterCriteriaDatasetTest.java 
	StockAndCashFlowDatasetTest.java CriteriaDatasetTest.java 
	FasterDatasetTest.java 
Log Message:
Refatoracao necessaria para o Forex...

Index: FasterDatasetTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/FasterDatasetTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FasterDatasetTest.java	31 Oct 2007 19:53:07 -0000	1.3
--- FasterDatasetTest.java	7 Nov 2007 23:40:48 -0000	1.4
***************
*** 6,11 ****
  import java.util.List;
  
- import net.sf.tail.Tick;
  import net.sf.tail.sample.SampleTimeSeries;
  
  import org.joda.time.DateTime;
--- 6,11 ----
  import java.util.List;
  
  import net.sf.tail.sample.SampleTimeSeries;
+ import net.sf.tail.tick.DefaultTick;
  
  import org.joda.time.DateTime;
***************
*** 18,30 ****
  	public void testFasterDataset()
  	{
! 		List<Tick> ticks = new ArrayList<Tick>();
! 		ticks.add(new Tick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 10, 11), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 11, 12), 6d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 12, 13), 7d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		FasterDataset dataset = new FasterDataset(series, true);
--- 18,30 ----
  	public void testFasterDataset()
  	{
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 10, 11), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 11, 12), 6d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 12, 13), 7d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		FasterDataset dataset = new FasterDataset(series, true);
***************
*** 35,47 ****
  	public void testFasterDatasetWithoutDoFast()
  	{
! 		List<Tick> ticks = new ArrayList<Tick>();
! 		ticks.add(new Tick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 10, 11), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 11, 12), 6d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 12, 13), 7d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		FasterDataset dataset = new FasterDataset(series);
--- 35,47 ----
  	public void testFasterDatasetWithoutDoFast()
  	{
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 10, 11), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 11, 12), 6d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 12, 13), 7d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		FasterDataset dataset = new FasterDataset(series);
***************
*** 52,64 ****
  	public void testFasterDatasetOnlyWithGains()
  	{
! 		List<Tick> ticks = new ArrayList<Tick>();
! 		ticks.add(new Tick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 10, 11), 6d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 11, 12), 7d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 12, 13), 8d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		FasterDataset dataset = new FasterDataset(series, true);
--- 52,64 ----
  	public void testFasterDatasetOnlyWithGains()
  	{
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 10, 11), 6d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 11, 12), 7d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 12, 13), 8d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		FasterDataset dataset = new FasterDataset(series, true);
***************
*** 68,80 ****
  	public void testFasterDatasetNotSoFast()
  	{
! 		List<Tick> ticks = new ArrayList<Tick>();
! 		ticks.add(new Tick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 10, 11), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 11, 12), 6d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 12, 13), 7d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		FasterDataset dataset = new FasterDataset(series, false);
--- 68,80 ----
  	public void testFasterDatasetNotSoFast()
  	{
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 10, 11), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 11, 12), 6d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 12, 13), 7d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		FasterDataset dataset = new FasterDataset(series, false);

Index: FasterCriteriaDatasetTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/FasterCriteriaDatasetTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FasterCriteriaDatasetTest.java	31 Oct 2007 19:53:07 -0000	1.1
--- FasterCriteriaDatasetTest.java	7 Nov 2007 23:40:48 -0000	1.2
***************
*** 11,15 ****
  import net.sf.tail.OperationType;
  import net.sf.tail.Strategy;
- import net.sf.tail.Tick;
  import net.sf.tail.TimeSeriesSlicer;
  import net.sf.tail.analysis.criteria.TotalProfitCriterion;
--- 11,14 ----
***************
*** 23,26 ****
--- 22,26 ----
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
  import net.sf.tail.strategy.IndicatorOverIndicatorStrategy;
+ import net.sf.tail.tick.DefaultTick;
  
  import org.joda.time.DateTime;
***************
*** 33,45 ****
  	public void testFasterCriteriaDatasetWithoutDoFast()
  	{
! 		List<Tick> ticks = new ArrayList<Tick>();
! 		ticks.add(new Tick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 10, 11), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 11, 12), 6d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 12, 13), 7d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		LinkedList<Report> reports;
--- 33,45 ----
  	public void testFasterCriteriaDatasetWithoutDoFast()
  	{
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 10, 11), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 11, 12), 6d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 12, 13), 7d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		LinkedList<Report> reports;
***************
*** 79,91 ****
  	public void testFasterCriteriaDatasetDoFast()
  	{
! 		List<Tick> ticks = new ArrayList<Tick>();
! 		ticks.add(new Tick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 10, 11), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 11, 12), 6d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 12, 13), 7d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		LinkedList<Report> reports;
--- 79,91 ----
  	public void testFasterCriteriaDatasetDoFast()
  	{
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 10, 11), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 11, 12), 6d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 12, 13), 7d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		LinkedList<Report> reports;
***************
*** 125,137 ****
  	public void testFasterCriteriaDatasetOnlyWithGains()
  	{
! 		List<Tick> ticks = new ArrayList<Tick>();
! 		ticks.add(new Tick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 10, 11), 6d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 11, 12), 7d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 12, 13), 8d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		LinkedList<Report> reports;
--- 125,137 ----
  	public void testFasterCriteriaDatasetOnlyWithGains()
  	{
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 10, 11), 6d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 11, 12), 7d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 12, 13), 8d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		LinkedList<Report> reports;
***************
*** 170,182 ****
  	public void testFasterCriteriaDatasetNotSoFast()
  	{
! 		List<Tick> ticks = new ArrayList<Tick>();
! 		ticks.add(new Tick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 10, 11), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 11, 12), 6d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 12, 13), 7d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		LinkedList<Report> reports;
--- 170,182 ----
  	public void testFasterCriteriaDatasetNotSoFast()
  	{
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 5, 6), 1d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 7, 8), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 8, 9), 4d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 9, 10), 5d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 10, 11), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 11, 12), 6d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 12, 13), 7d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		LinkedList<Report> reports;

Index: SeriesDatasetTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/SeriesDatasetTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SeriesDatasetTest.java	24 Oct 2007 20:51:58 -0000	1.9
--- SeriesDatasetTest.java	7 Nov 2007 23:40:48 -0000	1.10
***************
*** 10,14 ****
  import net.sf.tail.Operation;
  import net.sf.tail.OperationType;
- import net.sf.tail.Tick;
  import net.sf.tail.TimeSeries;
  import net.sf.tail.Trade;
--- 10,13 ----
***************
*** 16,19 ****
--- 15,19 ----
  import net.sf.tail.sample.SampleTimeSeries;
  import net.sf.tail.series.DefaultTimeSeries;
+ import net.sf.tail.tick.DefaultTick;
  
  import org.joda.time.DateTime;
***************
*** 29,33 ****
  	List<Trade> trades;
  
! 	List<Tick> ticks;
  
  	private SampleIndicator indicator1;
--- 29,33 ----
  	List<Trade> trades;
  
! 	List<DefaultTick> ticks;
  
  	private SampleIndicator indicator1;
***************
*** 38,46 ****
  	public void setUp() throws Exception {
  
! 		ticks = new LinkedList<Tick>();
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 6), 1d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 8), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 4d));
  		
  
--- 38,46 ----
  	public void setUp() throws Exception {
  
! 		ticks = new LinkedList<DefaultTick>();
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 6), 1d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 8), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 9), 4d));
  		
  
***************
*** 100,106 ****
  	@Test
  	public void testMoveRight() {
! 		List<Tick> ticks = new ArrayList<Tick>();
  		ticks = this.ticks;
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 10), 4d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		List<Indicator<? extends Number>> indicators = new ArrayList<Indicator<? extends Number>>();
--- 100,106 ----
  	@Test
  	public void testMoveRight() {
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
  		ticks = this.ticks;
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 10), 4d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		List<Indicator<? extends Number>> indicators = new ArrayList<Indicator<? extends Number>>();
***************
*** 118,123 ****
  	@Test
  	public void testMoveLeft() {
! 		List<Tick> ticks = this.ticks;
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 10), 4d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		List<Indicator<? extends Number>> indicators = new ArrayList<Indicator<? extends Number>>();
--- 118,123 ----
  	@Test
  	public void testMoveLeft() {
! 		List<DefaultTick> ticks = this.ticks;
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 10), 4d));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		List<Indicator<? extends Number>> indicators = new ArrayList<Indicator<? extends Number>>();

Index: CriteriaDatasetTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/CriteriaDatasetTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CriteriaDatasetTest.java	31 Oct 2007 20:11:35 -0000	1.5
--- CriteriaDatasetTest.java	7 Nov 2007 23:40:48 -0000	1.6
***************
*** 11,15 ****
  import net.sf.tail.OperationType;
  import net.sf.tail.Strategy;
- import net.sf.tail.Tick;
  import net.sf.tail.TimeSeries;
  import net.sf.tail.TimeSeriesSlicer;
--- 11,14 ----
***************
*** 23,26 ****
--- 22,26 ----
  import net.sf.tail.series.RegularSlicer;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
+ import net.sf.tail.tick.DefaultTick;
  
  import org.joda.time.DateTime;
***************
*** 35,39 ****
  	private List<Report> reports;
  
! 	private List<Tick> ticks;
  	
  	private Set<Strategy> strategies;
--- 35,39 ----
  	private List<Report> reports;
  
! 	private List<DefaultTick> ticks;
  	
  	private Set<Strategy> strategies;
***************
*** 48,64 ****
  	public void setUp() throws Exception {
  
! 		ticks = new LinkedList<Tick>();
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 6), 1d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 8), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 4d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 10), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 11), 1d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 12), 4d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 13), 6d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 14), 4d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 15), 6d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 16), 7d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 17), 8d));
  		
  		series = new DefaultTimeSeries(ticks);
--- 48,64 ----
  	public void setUp() throws Exception {
  
! 		ticks = new LinkedList<DefaultTick>();
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 6), 1d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 8), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 9), 4d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 10), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 11), 1d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 12), 4d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 13), 6d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 14), 4d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 15), 6d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 16), 7d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 17), 8d));
  		
  		series = new DefaultTimeSeries(ticks);

Index: CashFlowDatasetTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/CashFlowDatasetTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CashFlowDatasetTest.java	17 Oct 2007 16:41:53 -0000	1.6
--- CashFlowDatasetTest.java	7 Nov 2007 23:40:48 -0000	1.7
***************
*** 8,16 ****
  import net.sf.tail.Operation;
  import net.sf.tail.OperationType;
- import net.sf.tail.Tick;
  import net.sf.tail.TimeSeries;
  import net.sf.tail.Trade;
  import net.sf.tail.flow.CashFlow;
  import net.sf.tail.series.DefaultTimeSeries;
  
  import org.joda.time.DateTime;
--- 8,16 ----
  import net.sf.tail.Operation;
  import net.sf.tail.OperationType;
  import net.sf.tail.TimeSeries;
  import net.sf.tail.Trade;
  import net.sf.tail.flow.CashFlow;
  import net.sf.tail.series.DefaultTimeSeries;
+ import net.sf.tail.tick.DefaultTick;
  
  import org.joda.time.DateTime;
***************
*** 26,39 ****
  	List<Trade> trades;
  
! 	List<Tick> ticks;
  
  	@Before
  	public void setUp() throws Exception {
  
! 		ticks = new LinkedList<Tick>();
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 6), 1d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 8), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 4d));
  
  		series = new DefaultTimeSeries(ticks);
--- 26,39 ----
  	List<Trade> trades;
  
! 	List<DefaultTick> ticks;
  
  	@Before
  	public void setUp() throws Exception {
  
! 		ticks = new LinkedList<DefaultTick>();
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 6), 1d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 8), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 9), 4d));
  
  		series = new DefaultTimeSeries(ticks);
***************
*** 79,83 ****
  	@Test
  	public void testMoveRight() {
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 10), 4d));
  		series = new DefaultTimeSeries(ticks);
  		cashFlow = new CashFlow(series, trades);
--- 79,83 ----
  	@Test
  	public void testMoveRight() {
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 10), 4d));
  		series = new DefaultTimeSeries(ticks);
  		cashFlow = new CashFlow(series, trades);
***************
*** 92,96 ****
  	@Test
  	public void testMoveLeft() {
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 10), 4d));
  		series = new DefaultTimeSeries(ticks);
  		cashFlow = new CashFlow(series, trades);
--- 92,96 ----
  	@Test
  	public void testMoveLeft() {
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 10), 4d));
  		series = new DefaultTimeSeries(ticks);
  		cashFlow = new CashFlow(series, trades);

Index: StockAndCashFlowDatasetTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/StockAndCashFlowDatasetTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** StockAndCashFlowDatasetTest.java	17 Oct 2007 16:41:52 -0000	1.4
--- StockAndCashFlowDatasetTest.java	7 Nov 2007 23:40:48 -0000	1.5
***************
*** 8,12 ****
  import net.sf.tail.Operation;
  import net.sf.tail.OperationType;
- import net.sf.tail.Tick;
  import net.sf.tail.TimeSeries;
  import net.sf.tail.Trade;
--- 8,11 ----
***************
*** 14,17 ****
--- 13,17 ----
  import net.sf.tail.indicator.simple.ClosePriceIndicator;
  import net.sf.tail.series.DefaultTimeSeries;
+ import net.sf.tail.tick.DefaultTick;
  
  import org.joda.time.DateTime;
***************
*** 29,42 ****
  	List<Trade> trades;
  
! 	List<Tick> ticks;
  
  	@Before
  	public void setUp() throws Exception {
  
! 		ticks = new LinkedList<Tick>();
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 6), 1d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 8), 3d));
! 		ticks.add(new Tick(new DateTime().withDate(2007, 6, 9), 4d));
  
  		series = new DefaultTimeSeries(ticks);
--- 29,42 ----
  	List<Trade> trades;
  
! 	List<DefaultTick> ticks;
  
  	@Before
  	public void setUp() throws Exception {
  
! 		ticks = new LinkedList<DefaultTick>();
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 6), 1d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 7), 2d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 8), 3d));
! 		ticks.add(new DefaultTick(new DateTime().withDate(2007, 6, 9), 4d));
  
  		series = new DefaultTimeSeries(ticks);

[Tail-cvs] Tail/src/test/net/sf/tail/indicator/tracker AverageDirectionalMovementIndicatorTest.java, 1.2 WilliamsRIndicatorTest.java, 1.7 AccelerationDecelerationIndicatorTest.java, 1.2 DirectionalMovementIndicatorTest.java, 1.2 ParabolicSarIndicatorTest.java, 1.5

[Carlos <ma...@us...>]

Update of /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/tracker
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21707/src/test/net/sf/tail/indicator/tracker

Modified Files:
	AverageDirectionalMovementIndicatorTest.java 
	WilliamsRIndicatorTest.java 
	AccelerationDecelerationIndicatorTest.java 
	DirectionalMovementIndicatorTest.java 
	ParabolicSarIndicatorTest.java 
Log Message:
Refatoracao necessaria para o Forex...

Index: ParabolicSarIndicatorTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/tracker/ParabolicSarIndicatorTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ParabolicSarIndicatorTest.java	17 Oct 2007 20:06:17 -0000	1.4
--- ParabolicSarIndicatorTest.java	7 Nov 2007 23:40:48 -0000	1.5
***************
*** 6,11 ****
  import java.util.List;
  
- import net.sf.tail.Tick;
  import net.sf.tail.sample.SampleTimeSeries;
  
  import org.junit.Test;
--- 6,11 ----
  import java.util.List;
  
  import net.sf.tail.sample.SampleTimeSeries;
+ import net.sf.tail.tick.DefaultTick;
  
  import org.junit.Test;
***************
*** 16,25 ****
  	public void trendSwitchTest()
  	{
! 		List<Tick> ticks = new ArrayList<Tick>();
! 		ticks.add(new Tick(0, 10, 13, 8));
! 		ticks.add(new Tick(0, 8, 11, 6));
! 		ticks.add(new Tick(0, 6, 9, 4));
! 		ticks.add(new Tick(0, 11, 15, 9));
! 		ticks.add(new Tick(0, 13, 15, 9));
  		ParabolicSarIndicator sar = new ParabolicSarIndicator(new SampleTimeSeries(ticks), 1);
  		
--- 16,25 ----
  	public void trendSwitchTest()
  	{
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
! 		ticks.add(new DefaultTick(0, 10, 13, 8));
! 		ticks.add(new DefaultTick(0, 8, 11, 6));
! 		ticks.add(new DefaultTick(0, 6, 9, 4));
! 		ticks.add(new DefaultTick(0, 11, 15, 9));
! 		ticks.add(new DefaultTick(0, 13, 15, 9));
  		ParabolicSarIndicator sar = new ParabolicSarIndicator(new SampleTimeSeries(ticks), 1);
  		
***************
*** 35,44 ****
  	public void TrendSwitchTest2()
  	{
! 		List<Tick> ticks = new ArrayList<Tick>();
! 		ticks.add(new Tick(0, 10, 13, 11));
! 		ticks.add(new Tick(0, 10, 15, 13));
! 		ticks.add(new Tick(0, 12, 18, 11));
! 		ticks.add(new Tick(0, 10, 15, 9));
! 		ticks.add(new Tick(0, 9, 15, 9));
  		
  		ParabolicSarIndicator sar = new ParabolicSarIndicator(new SampleTimeSeries(ticks), 1);
--- 35,44 ----
  	public void TrendSwitchTest2()
  	{
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
! 		ticks.add(new DefaultTick(0, 10, 13, 11));
! 		ticks.add(new DefaultTick(0, 10, 15, 13));
! 		ticks.add(new DefaultTick(0, 12, 18, 11));
! 		ticks.add(new DefaultTick(0, 10, 15, 9));
! 		ticks.add(new DefaultTick(0, 9, 15, 9));
  		
  		ParabolicSarIndicator sar = new ParabolicSarIndicator(new SampleTimeSeries(ticks), 1);
***************
*** 54,63 ****
  	public void UpTrendTest()
  	{
! 		List<Tick> ticks = new ArrayList<Tick>();
! 		ticks.add(new Tick(0, 10, 13, 11));
! 		ticks.add(new Tick(0, 17, 15, 11.38));
! 		ticks.add(new Tick(0, 18, 16, 14));
! 		ticks.add(new Tick(0, 19, 17, 12));
! 		ticks.add(new Tick(0, 20, 18, 9));
  		
  		ParabolicSarIndicator sar = new ParabolicSarIndicator(new SampleTimeSeries(ticks), 1);
--- 54,63 ----
  	public void UpTrendTest()
  	{
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
! 		ticks.add(new DefaultTick(0, 10, 13, 11));
! 		ticks.add(new DefaultTick(0, 17, 15, 11.38));
! 		ticks.add(new DefaultTick(0, 18, 16, 14));
! 		ticks.add(new DefaultTick(0, 19, 17, 12));
! 		ticks.add(new DefaultTick(0, 20, 18, 9));
  		
  		ParabolicSarIndicator sar = new ParabolicSarIndicator(new SampleTimeSeries(ticks), 1);
***************
*** 73,83 ****
  	public void DownTrendTest()
  	{
! 		List<Tick> ticks = new ArrayList<Tick>();
! 		ticks.add(new Tick(0, 20, 18, 9));
! 		ticks.add(new Tick(0, 19, 17, 12));
! 		ticks.add(new Tick(0, 18, 16, 14));
! 		ticks.add(new Tick(0, 17, 15, 11.38));
! 		ticks.add(new Tick(0, 10, 13, 11));
! 		ticks.add(new Tick(0, 10, 30, 11));
  		
  		ParabolicSarIndicator sar = new ParabolicSarIndicator(new SampleTimeSeries(ticks), 1);
--- 73,83 ----
  	public void DownTrendTest()
  	{
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
! 		ticks.add(new DefaultTick(0, 20, 18, 9));
! 		ticks.add(new DefaultTick(0, 19, 17, 12));
! 		ticks.add(new DefaultTick(0, 18, 16, 14));
! 		ticks.add(new DefaultTick(0, 17, 15, 11.38));
! 		ticks.add(new DefaultTick(0, 10, 13, 11));
! 		ticks.add(new DefaultTick(0, 10, 30, 11));
  		
  		ParabolicSarIndicator sar = new ParabolicSarIndicator(new SampleTimeSeries(ticks), 1);

Index: AccelerationDecelerationIndicatorTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/tracker/AccelerationDecelerationIndicatorTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AccelerationDecelerationIndicatorTest.java	15 Oct 2007 19:24:15 -0000	1.1
--- AccelerationDecelerationIndicatorTest.java	7 Nov 2007 23:40:47 -0000	1.2
***************
*** 6,12 ****
  import java.util.List;
  
- import net.sf.tail.Tick;
  import net.sf.tail.TimeSeries;
  import net.sf.tail.sample.SampleTimeSeries;
  
  import org.junit.Before;
--- 6,12 ----
  import java.util.List;
  
  import net.sf.tail.TimeSeries;
  import net.sf.tail.sample.SampleTimeSeries;
+ import net.sf.tail.tick.DefaultTick;
  
  import org.junit.Before;
***************
*** 20,30 ****
  	public void setUp() throws Exception {
  
! 		List<Tick> ticks = new ArrayList<Tick>();
  
! 		ticks.add(new Tick(0, 0, 16, 8));
! 		ticks.add(new Tick(0, 0, 12, 6));
! 		ticks.add(new Tick(0, 0, 18, 14));
! 		ticks.add(new Tick(0, 0, 10, 6));
! 		ticks.add(new Tick(0, 0, 8, 4));
  
  		this.series = new SampleTimeSeries(ticks);
--- 20,30 ----
  	public void setUp() throws Exception {
  
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
  
! 		ticks.add(new DefaultTick(0, 0, 16, 8));
! 		ticks.add(new DefaultTick(0, 0, 12, 6));
! 		ticks.add(new DefaultTick(0, 0, 18, 14));
! 		ticks.add(new DefaultTick(0, 0, 10, 6));
! 		ticks.add(new DefaultTick(0, 0, 8, 4));
  
  		this.series = new SampleTimeSeries(ticks);

Index: AverageDirectionalMovementIndicatorTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/tracker/AverageDirectionalMovementIndicatorTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AverageDirectionalMovementIndicatorTest.java	19 Sep 2007 19:59:19 -0000	1.1
--- AverageDirectionalMovementIndicatorTest.java	7 Nov 2007 23:40:47 -0000	1.2
***************
*** 6,11 ****
  import java.util.List;
  
- import net.sf.tail.Tick;
  import net.sf.tail.sample.SampleTimeSeries;
  
  import org.junit.Test;
--- 6,11 ----
  import java.util.List;
  
  import net.sf.tail.sample.SampleTimeSeries;
+ import net.sf.tail.tick.DefaultTick;
  
  import org.junit.Test;
***************
*** 16,24 ****
  	public void testGetValue()
  	{
! 		List<Tick> ticks = new ArrayList<Tick>();
  		
! 		ticks.add(new Tick(0, 0, 10, 2));
! 		ticks.add(new Tick(0, 0, 12, 2));
! 		ticks.add(new Tick(0, 0, 15, 2));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		AverageDirectionalMovementIndicator adm = new AverageDirectionalMovementIndicator(series, 3);
--- 16,24 ----
  	public void testGetValue()
  	{
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
  		
! 		ticks.add(new DefaultTick(0, 0, 10, 2));
! 		ticks.add(new DefaultTick(0, 0, 12, 2));
! 		ticks.add(new DefaultTick(0, 0, 15, 2));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		AverageDirectionalMovementIndicator adm = new AverageDirectionalMovementIndicator(series, 3);

Index: WilliamsRIndicatorTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/tracker/WilliamsRIndicatorTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** WilliamsRIndicatorTest.java	17 Oct 2007 16:41:55 -0000	1.6
--- WilliamsRIndicatorTest.java	7 Nov 2007 23:40:47 -0000	1.7
***************
*** 6,10 ****
  import java.util.List;
  
- import net.sf.tail.Tick;
  import net.sf.tail.TimeSeries;
  import net.sf.tail.indicator.simple.ClosePriceIndicator;
--- 6,9 ----
***************
*** 12,15 ****
--- 11,15 ----
  import net.sf.tail.indicator.simple.MinPriceIndicator;
  import net.sf.tail.series.DefaultTimeSeries;
+ import net.sf.tail.tick.DefaultTick;
  
  import org.junit.Before;
***************
*** 22,39 ****
  	public void setUp() throws Exception {
  
! 		List<Tick> ticks = new ArrayList<Tick>();
! 		ticks.add(new Tick(44.98, 45.05, 45.17, 44.96));
! 		ticks.add(new Tick(45.05, 45.10, 45.15, 44.99));
! 		ticks.add(new Tick(45.11, 45.19, 45.32, 45.11));
! 		ticks.add(new Tick(45.19, 45.14, 45.25, 45.04));
! 		ticks.add(new Tick(45.12, 45.15, 45.20, 45.10));
! 		ticks.add(new Tick(45.15, 45.14, 45.20, 45.10));
! 		ticks.add(new Tick(45.13, 45.10, 45.16, 45.07));
! 		ticks.add(new Tick(45.12, 45.15, 45.22, 45.10));
! 		ticks.add(new Tick(45.15, 45.22, 45.27, 45.14));
! 		ticks.add(new Tick(45.24, 45.43, 45.45, 45.20));
! 		ticks.add(new Tick(45.43, 45.44, 45.50, 45.39));
! 		ticks.add(new Tick(45.43, 45.55, 45.60, 45.35));
! 		ticks.add(new Tick(45.58, 45.55, 45.61, 45.39));
  
  		data = new DefaultTimeSeries(ticks);
--- 22,39 ----
  	public void setUp() throws Exception {
  
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
! 		ticks.add(new DefaultTick(44.98, 45.05, 45.17, 44.96));
! 		ticks.add(new DefaultTick(45.05, 45.10, 45.15, 44.99));
! 		ticks.add(new DefaultTick(45.11, 45.19, 45.32, 45.11));
! 		ticks.add(new DefaultTick(45.19, 45.14, 45.25, 45.04));
! 		ticks.add(new DefaultTick(45.12, 45.15, 45.20, 45.10));
! 		ticks.add(new DefaultTick(45.15, 45.14, 45.20, 45.10));
! 		ticks.add(new DefaultTick(45.13, 45.10, 45.16, 45.07));
! 		ticks.add(new DefaultTick(45.12, 45.15, 45.22, 45.10));
! 		ticks.add(new DefaultTick(45.15, 45.22, 45.27, 45.14));
! 		ticks.add(new DefaultTick(45.24, 45.43, 45.45, 45.20));
! 		ticks.add(new DefaultTick(45.43, 45.44, 45.50, 45.39));
! 		ticks.add(new DefaultTick(45.43, 45.55, 45.60, 45.35));
! 		ticks.add(new DefaultTick(45.58, 45.55, 45.61, 45.39));
  
  		data = new DefaultTimeSeries(ticks);

Index: DirectionalMovementIndicatorTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/tracker/DirectionalMovementIndicatorTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DirectionalMovementIndicatorTest.java	19 Sep 2007 19:59:19 -0000	1.1
--- DirectionalMovementIndicatorTest.java	7 Nov 2007 23:40:47 -0000	1.2
***************
*** 6,11 ****
  import java.util.List;
  
- import net.sf.tail.Tick;
  import net.sf.tail.sample.SampleTimeSeries;
  
  import org.junit.Test;
--- 6,11 ----
  import java.util.List;
  
  import net.sf.tail.sample.SampleTimeSeries;
+ import net.sf.tail.tick.DefaultTick;
  
  import org.junit.Test;
***************
*** 17,25 ****
  	public void testGetValue()
  	{
! 		List<Tick> ticks = new ArrayList<Tick>();
  		
! 		ticks.add(new Tick(0, 0, 10, 2));
! 		ticks.add(new Tick(0, 0, 12, 2));
! 		ticks.add(new Tick(0, 0, 15, 2));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		DirectionalMovementIndicator dm = new DirectionalMovementIndicator(series, 3);
--- 17,25 ----
  	public void testGetValue()
  	{
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
  		
! 		ticks.add(new DefaultTick(0, 0, 10, 2));
! 		ticks.add(new DefaultTick(0, 0, 12, 2));
! 		ticks.add(new DefaultTick(0, 0, 15, 2));
  		SampleTimeSeries series = new SampleTimeSeries(ticks);
  		DirectionalMovementIndicator dm = new DirectionalMovementIndicator(series, 3);

[Tail-cvs] Tail/src/test/net/sf/tail/indicator/oscilator StochasticOscilatorKTest.java, 1.8 AwesomeOscillatorIndicatorTest.java, 1.2 StochasticOscilatorDTest.java, 1.8

[Carlos <ma...@us...>]

Update of /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/oscilator
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21707/src/test/net/sf/tail/indicator/oscilator

Modified Files:
	StochasticOscilatorKTest.java 
	AwesomeOscillatorIndicatorTest.java 
	StochasticOscilatorDTest.java 
Log Message:
Refatoracao necessaria para o Forex...

Index: StochasticOscilatorKTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/oscilator/StochasticOscilatorKTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** StochasticOscilatorKTest.java	17 Oct 2007 16:41:54 -0000	1.7
--- StochasticOscilatorKTest.java	7 Nov 2007 23:40:48 -0000	1.8
***************
*** 6,12 ****
  import java.util.List;
  
- import net.sf.tail.Tick;
  import net.sf.tail.TimeSeries;
  import net.sf.tail.series.DefaultTimeSeries;
  
  import org.junit.Before;
--- 6,12 ----
  import java.util.List;
  
  import net.sf.tail.TimeSeries;
  import net.sf.tail.series.DefaultTimeSeries;
+ import net.sf.tail.tick.DefaultTick;
  
  import org.junit.Before;
***************
*** 20,38 ****
  	public void setUp() {
  
! 		List<Tick> ticks = new ArrayList<Tick>();
! 		ticks.add(new Tick(44.98, 119.13, 119.50, 116.00));
! 		ticks.add(new Tick(45.05, 116.75, 119.94, 116.00));
! 		ticks.add(new Tick(45.11, 113.50, 118.44, 111.63));
! 		ticks.add(new Tick(45.19, 111.56, 114.19, 110.06));
! 		ticks.add(new Tick(45.12, 112.25, 112.81, 109.63));
! 		ticks.add(new Tick(45.15, 110.00, 113.44, 109.13));
! 		ticks.add(new Tick(45.13, 113.50, 115.81, 110.38));
! 		ticks.add(new Tick(45.12, 117.13, 117.50, 114.06));
! 		ticks.add(new Tick(45.15, 115.63, 118.44, 114.81));
! 		ticks.add(new Tick(45.24, 114.13, 116.88, 113.13));
! 		ticks.add(new Tick(45.43, 118.81, 119.00, 116.19));
! 		ticks.add(new Tick(45.43, 117.38, 119.75, 117.00));
! 		ticks.add(new Tick(45.58, 119.13, 119.13, 116.88));
! 		ticks.add(new Tick(45.58, 115.38, 119.44, 114.56));
  
  		data = new DefaultTimeSeries(ticks);
--- 20,38 ----
  	public void setUp() {
  
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
! 		ticks.add(new DefaultTick(44.98, 119.13, 119.50, 116.00));
! 		ticks.add(new DefaultTick(45.05, 116.75, 119.94, 116.00));
! 		ticks.add(new DefaultTick(45.11, 113.50, 118.44, 111.63));
! 		ticks.add(new DefaultTick(45.19, 111.56, 114.19, 110.06));
! 		ticks.add(new DefaultTick(45.12, 112.25, 112.81, 109.63));
! 		ticks.add(new DefaultTick(45.15, 110.00, 113.44, 109.13));
! 		ticks.add(new DefaultTick(45.13, 113.50, 115.81, 110.38));
! 		ticks.add(new DefaultTick(45.12, 117.13, 117.50, 114.06));
! 		ticks.add(new DefaultTick(45.15, 115.63, 118.44, 114.81));
! 		ticks.add(new DefaultTick(45.24, 114.13, 116.88, 113.13));
! 		ticks.add(new DefaultTick(45.43, 118.81, 119.00, 116.19));
! 		ticks.add(new DefaultTick(45.43, 117.38, 119.75, 117.00));
! 		ticks.add(new DefaultTick(45.58, 119.13, 119.13, 116.88));
! 		ticks.add(new DefaultTick(45.58, 115.38, 119.44, 114.56));
  
  		data = new DefaultTimeSeries(ticks);

Index: AwesomeOscillatorIndicatorTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/oscilator/AwesomeOscillatorIndicatorTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AwesomeOscillatorIndicatorTest.java	15 Oct 2007 19:24:15 -0000	1.1
--- AwesomeOscillatorIndicatorTest.java	7 Nov 2007 23:40:48 -0000	1.2
***************
*** 6,13 ****
  import java.util.List;
  
- import net.sf.tail.Tick;
  import net.sf.tail.TimeSeries;
  import net.sf.tail.indicator.simple.AverageHighLowIndicator;
  import net.sf.tail.sample.SampleTimeSeries;
  
  import org.junit.Before;
--- 6,13 ----
  import java.util.List;
  
  import net.sf.tail.TimeSeries;
  import net.sf.tail.indicator.simple.AverageHighLowIndicator;
  import net.sf.tail.sample.SampleTimeSeries;
+ import net.sf.tail.tick.DefaultTick;
  
  import org.junit.Before;
***************
*** 20,30 ****
  	public void setUp() throws Exception {
  
! 		List<Tick> ticks = new ArrayList<Tick>();
  
! 		ticks.add(new Tick(0, 0, 16, 8));//12
! 		ticks.add(new Tick(0, 0, 12, 6));//9
! 		ticks.add(new Tick(0, 0, 18, 14));//16
! 		ticks.add(new Tick(0, 0, 10, 6));//8
! 		ticks.add(new Tick(0, 0, 8, 4));//6
  
  		this.series = new SampleTimeSeries(ticks);
--- 20,30 ----
  	public void setUp() throws Exception {
  
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
  
! 		ticks.add(new DefaultTick(0, 0, 16, 8));//12
! 		ticks.add(new DefaultTick(0, 0, 12, 6));//9
! 		ticks.add(new DefaultTick(0, 0, 18, 14));//16
! 		ticks.add(new DefaultTick(0, 0, 10, 6));//8
! 		ticks.add(new DefaultTick(0, 0, 8, 4));//6
  
  		this.series = new SampleTimeSeries(ticks);

Index: StochasticOscilatorDTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/indicator/oscilator/StochasticOscilatorDTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** StochasticOscilatorDTest.java	17 Oct 2007 16:41:54 -0000	1.7
--- StochasticOscilatorDTest.java	7 Nov 2007 23:40:48 -0000	1.8
***************
*** 6,13 ****
  import java.util.List;
  
- import net.sf.tail.Tick;
  import net.sf.tail.TimeSeries;
  import net.sf.tail.indicator.tracker.SMAIndicator;
  import net.sf.tail.series.DefaultTimeSeries;
  
  import org.junit.Before;
--- 6,13 ----
  import java.util.List;
  
  import net.sf.tail.TimeSeries;
  import net.sf.tail.indicator.tracker.SMAIndicator;
  import net.sf.tail.series.DefaultTimeSeries;
+ import net.sf.tail.tick.DefaultTick;
  
  import org.junit.Before;
***************
*** 20,38 ****
  	public void setUp() {
  
! 		List<Tick> ticks = new ArrayList<Tick>();
! 		ticks.add(new Tick(44.98, 119.13, 119.50, 116.00));
! 		ticks.add(new Tick(45.05, 116.75, 119.94, 116.00));
! 		ticks.add(new Tick(45.11, 113.50, 118.44, 111.63));
! 		ticks.add(new Tick(45.19, 111.56, 114.19, 110.06));
! 		ticks.add(new Tick(45.12, 112.25, 112.81, 109.63));
! 		ticks.add(new Tick(45.15, 110.00, 113.44, 109.13));
! 		ticks.add(new Tick(45.13, 113.50, 115.81, 110.38));
! 		ticks.add(new Tick(45.12, 117.13, 117.50, 114.06));
! 		ticks.add(new Tick(45.15, 115.63, 118.44, 114.81));
! 		ticks.add(new Tick(45.24, 114.13, 116.88, 113.13));
! 		ticks.add(new Tick(45.43, 118.81, 119.00, 116.19));
! 		ticks.add(new Tick(45.43, 117.38, 119.75, 117.00));
! 		ticks.add(new Tick(45.58, 119.13, 119.13, 116.88));
! 		ticks.add(new Tick(45.58, 115.38, 119.44, 114.56));
  
  		data = new DefaultTimeSeries(ticks);
--- 20,38 ----
  	public void setUp() {
  
! 		List<DefaultTick> ticks = new ArrayList<DefaultTick>();
! 		ticks.add(new DefaultTick(44.98, 119.13, 119.50, 116.00));
! 		ticks.add(new DefaultTick(45.05, 116.75, 119.94, 116.00));
! 		ticks.add(new DefaultTick(45.11, 113.50, 118.44, 111.63));
! 		ticks.add(new DefaultTick(45.19, 111.56, 114.19, 110.06));
! 		ticks.add(new DefaultTick(45.12, 112.25, 112.81, 109.63));
! 		ticks.add(new DefaultTick(45.15, 110.00, 113.44, 109.13));
! 		ticks.add(new DefaultTick(45.13, 113.50, 115.81, 110.38));
! 		ticks.add(new DefaultTick(45.12, 117.13, 117.50, 114.06));
! 		ticks.add(new DefaultTick(45.15, 115.63, 118.44, 114.81));
! 		ticks.add(new DefaultTick(45.24, 114.13, 116.88, 113.13));
! 		ticks.add(new DefaultTick(45.43, 118.81, 119.00, 116.19));
! 		ticks.add(new DefaultTick(45.43, 117.38, 119.75, 117.00));
! 		ticks.add(new DefaultTick(45.58, 119.13, 119.13, 116.88));
! 		ticks.add(new DefaultTick(45.58, 115.38, 119.44, 114.56));
  
  		data = new DefaultTimeSeries(ticks);