tail-cvs — cvs commits

[Tail-cvs] Tail/src/test/net/sf/tail ReportXmlSerializerTest.java, 1.5 EMAWalkTest.java, 1.16 StockAnalysisXmlSerializerTest.java, 1.7 EMACompleteTest.java, 1.16

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

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

Modified Files:
	ReportXmlSerializerTest.java EMAWalkTest.java 
	StockAnalysisXmlSerializerTest.java EMACompleteTest.java 
Log Message:
Refatoração dos Slicer

Index: EMACompleteTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/EMACompleteTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** EMACompleteTest.java	22 Sep 2007 18:47:22 -0000	1.15
--- EMACompleteTest.java	3 Oct 2007 22:56:47 -0000	1.16
***************
*** 29,33 ****
  import net.sf.tail.report.ReportHTMLGenerator;
  import net.sf.tail.runner.HistoryRunner;
! import net.sf.tail.series.SlicerByTimePeriod;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
  
--- 29,33 ----
  import net.sf.tail.report.ReportHTMLGenerator;
  import net.sf.tail.runner.HistoryRunner;
! import net.sf.tail.series.FullyMemorizedSlicer;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
  
***************
*** 54,59 ****
  		}
  
! 		Report r = w.walk(strategies, new SlicerByTimePeriod(timeSeries, new Period().withMonths(1),
! 				SlicerType.MEMORIZED), new TotalProfitCriterion());
  		List<AnalysisCriterion> criteria = new LinkedList<AnalysisCriterion>();
  		criteria.add(new NumberOfTradesCriterion());
--- 54,58 ----
  		}
  
! 		Report r = w.walk(strategies, new FullyMemorizedSlicer(timeSeries, new Period().withMonths(1)), new TotalProfitCriterion());
  		List<AnalysisCriterion> criteria = new LinkedList<AnalysisCriterion>();
  		criteria.add(new NumberOfTradesCriterion());

Index: EMAWalkTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/EMAWalkTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** EMAWalkTest.java	22 Sep 2007 18:47:22 -0000	1.15
--- EMAWalkTest.java	3 Oct 2007 22:56:47 -0000	1.16
***************
*** 19,23 ****
  import net.sf.tail.report.ReportHTMLGenerator;
  import net.sf.tail.runner.HistoryRunner;
! import net.sf.tail.series.SlicerByTimePeriod;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
  
--- 19,23 ----
  import net.sf.tail.report.ReportHTMLGenerator;
  import net.sf.tail.runner.HistoryRunner;
! import net.sf.tail.series.FullyMemorizedSlicer;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
  
***************
*** 44,49 ****
  
  		// slice the series by each year, since 1999
! 		TimeSeriesSlicer slicer = new SlicerByTimePeriod(series, new Period().withYears(1), new DateTime()
! 				.withYear(1999), SlicerType.MEMORIZED);
  
  		// walks year by year, forgetting the past and generates the report in
--- 44,49 ----
  
  		// slice the series by each year, since 1999
! 		TimeSeriesSlicer slicer = new FullyMemorizedSlicer(series, new Period().withYears(1), new DateTime()
! 				.withYear(1999));
  
  		// walks year by year, forgetting the past and generates the report in

Index: StockAnalysisXmlSerializerTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/StockAnalysisXmlSerializerTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** StockAnalysisXmlSerializerTest.java	3 Oct 2007 18:58:32 -0000	1.6
--- StockAnalysisXmlSerializerTest.java	3 Oct 2007 22:56:47 -0000	1.7
***************
*** 23,27 ****
  import net.sf.tail.io.reader.CedroTimeSeriesLoader;
  import net.sf.tail.runner.HistoryRunner;
! import net.sf.tail.series.SlicerByTimePeriod;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
  
--- 23,27 ----
  import net.sf.tail.io.reader.CedroTimeSeriesLoader;
  import net.sf.tail.runner.HistoryRunner;
! import net.sf.tail.series.FullyMemorizedSlicer;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
  
***************
*** 32,36 ****
  	public void testXMLSerialize() {
  		try {
! 			Stock stock = new Stock("test", "BaseBovespa/15min/ambv4.csv",new CedroTimeSeriesLoader());
  
  			AnalysisCriterion applyedCriterion = new TotalProfitCriterion();
--- 32,36 ----
  	public void testXMLSerialize() {
  		try {
! 			Stock stock = new Stock("test", "BaseBovespa/15min/ambv4.csv", new CedroTimeSeriesLoader());
  
  			AnalysisCriterion applyedCriterion = new TotalProfitCriterion();
***************
*** 39,43 ****
  			timeSeries = stock.getSeries();
  
! 			TimeSeriesSlicer slicer = new SlicerByTimePeriod(timeSeries, new Period().withDays(1), SlicerType.MEMORIZED);
  			Runner runner = new HistoryRunner(OperationType.BUY);
  			Evaluator evaluator = new BestStrategyEvaluator(runner);
--- 39,43 ----
  			timeSeries = stock.getSeries();
  
! 			TimeSeriesSlicer slicer = new FullyMemorizedSlicer(timeSeries, new Period().withDays(1));
  			Runner runner = new HistoryRunner(OperationType.BUY);
  			Evaluator evaluator = new BestStrategyEvaluator(runner);
***************
*** 58,62 ****
  			}
  
! 			stockAnalysis.createReport("",strategies);
  
  			strategies = new HashSet<Strategy>();
--- 58,62 ----
  			}
  
! 			stockAnalysis.createReport("", strategies);
  
  			strategies = new HashSet<Strategy>();
***************
*** 69,73 ****
  			}
  
! 			stockAnalysis.createReport("",strategies);
  
  			strategies = new HashSet<Strategy>();
--- 69,73 ----
  			}
  
! 			stockAnalysis.createReport("", strategies);
  
  			strategies = new HashSet<Strategy>();
***************
*** 80,84 ****
  			}
  
! 			stockAnalysis.createReport("",strategies);
  
  			StockAnalysisSerializer serializer = new StockAnalysisSerializer();
--- 80,84 ----
  			}
  
! 			stockAnalysis.createReport("", strategies);
  
  			StockAnalysisSerializer serializer = new StockAnalysisSerializer();

Index: ReportXmlSerializerTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/ReportXmlSerializerTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ReportXmlSerializerTest.java	26 Sep 2007 19:36:21 -0000	1.4
--- ReportXmlSerializerTest.java	3 Oct 2007 22:56:47 -0000	1.5
***************
*** 19,23 ****
  import net.sf.tail.report.Report;
  import net.sf.tail.runner.HistoryRunner;
! import net.sf.tail.series.SlicerByTimePeriod;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
  
--- 19,23 ----
  import net.sf.tail.report.Report;
  import net.sf.tail.runner.HistoryRunner;
! import net.sf.tail.series.RegularSlicer;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
  
***************
*** 50,55 ****
  		}
  
! 		Report r = w.walk(strategies,
! 				new SlicerByTimePeriod(timeSeries, new Period().withDays(1), SlicerType.MEMORIZED),
  				new TotalProfitCriterion());
  		ReportSerializer serializer = new ReportSerializer();
--- 50,54 ----
  		}
  
! 		Report r = w.walk(strategies, new RegularSlicer(timeSeries, new Period().withDays(1)),
  				new TotalProfitCriterion());
  		ReportSerializer serializer = new ReportSerializer();

[Tail-cvs] Tail/src/java/net/sf/tail TimeSeriesSlicer.java, 1.10 SlicerType.java, NONE

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

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

Modified Files:
	TimeSeriesSlicer.java 
Removed Files:
	SlicerType.java 
Log Message:
Refatoração dos Slicer

--- SlicerType.java DELETED ---

Index: TimeSeriesSlicer.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/TimeSeriesSlicer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TimeSeriesSlicer.java	26 Sep 2007 19:36:22 -0000	1.9
--- TimeSeriesSlicer.java	3 Oct 2007 22:56:47 -0000	1.10
***************
*** 11,18 ****
  	TimeSeries getSeries();
  
- 	TimeSeries getBiggerSlice(int position, int numberOfPeriodsOfTheSlice);
- 
  	String getName();
- 
  	
  	String getPeriodName();
--- 11,15 ----
***************
*** 20,27 ****
  	Period getPeriod();
  	
- 	SlicerType getSlicerType();
- 
- 	TimeSeriesSlicer applyForType(SlicerType type);
- 	
  	TimeSeriesSlicer applyForSeries(TimeSeries series);
  }
\ No newline at end of file
--- 17,20 ----

[Tail-cvs] Tail/src/test/net/sf/tail/report ReportGeneratorTest.java, 1.23 ReportTest.java, 1.4 CompleteReportGeneratorTest.java, 1.5 ReportImageTest.java, 1.5

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

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

Modified Files:
	ReportGeneratorTest.java ReportTest.java 
	CompleteReportGeneratorTest.java ReportImageTest.java 
Log Message:
Refatoração dos Slicer

Index: CompleteReportGeneratorTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/CompleteReportGeneratorTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CompleteReportGeneratorTest.java	22 Sep 2007 18:47:22 -0000	1.4
--- CompleteReportGeneratorTest.java	3 Oct 2007 22:56:47 -0000	1.5
***************
*** 10,14 ****
  import net.sf.tail.Operation;
  import net.sf.tail.OperationType;
! import net.sf.tail.SlicerType;
  import net.sf.tail.Trade;
  import net.sf.tail.analysis.criteria.NumberOfTicksCriterion;
--- 10,14 ----
  import net.sf.tail.Operation;
  import net.sf.tail.OperationType;
! import net.sf.tail.TimeSeriesSlicer;
  import net.sf.tail.Trade;
  import net.sf.tail.analysis.criteria.NumberOfTicksCriterion;
***************
*** 17,21 ****
  import net.sf.tail.runner.HistoryRunner;
  import net.sf.tail.sample.SampleTimeSeries;
! import net.sf.tail.series.SlicerByTimePeriod;
  import net.sf.tail.strategy.FakeStrategy;
  
--- 17,21 ----
  import net.sf.tail.runner.HistoryRunner;
  import net.sf.tail.sample.SampleTimeSeries;
! import net.sf.tail.series.FullyMemorizedSlicer;
  import net.sf.tail.strategy.FakeStrategy;
  
***************
*** 28,37 ****
  	private List<Decision> decisions;
  
! 	private SlicerByTimePeriod slicer;
  
  	private List<AnalysisCriterion> criteria;
! 	
  	private List<String> urls;
! 	
  	@Before
  	public void setUp() throws Exception {
--- 28,37 ----
  	private List<Decision> decisions;
  
! 	private TimeSeriesSlicer slicer;
  
  	private List<AnalysisCriterion> criteria;
! 
  	private List<String> urls;
! 
  	@Before
  	public void setUp() throws Exception {
***************
*** 45,54 ****
  				new TotalProfitCriterion(), trades, new HistoryRunner(OperationType.BUY));
  		decisions.add(decision);
! 		slicer = new SlicerByTimePeriod(series, new Period().withYears(1), SlicerType.MEMORIZED);
! 		
  		criteria = new ArrayList<AnalysisCriterion>();
  		criteria.add(new NumberOfTicksCriterion());
  		criteria.add(new TotalProfitCriterion());
! 		
  		urls = new ArrayList<String>();
  		urls.add("report.html");
--- 45,54 ----
  				new TotalProfitCriterion(), trades, new HistoryRunner(OperationType.BUY));
  		decisions.add(decision);
! 		slicer = new FullyMemorizedSlicer(series, new Period().withYears(1));
! 
  		criteria = new ArrayList<AnalysisCriterion>();
  		criteria.add(new NumberOfTicksCriterion());
  		criteria.add(new TotalProfitCriterion());
! 
  		urls = new ArrayList<String>();
  		urls.add("report.html");
***************
*** 58,62 ****
  	public void testSMAGenerate() throws IOException {
  		Report report = new Report(new TotalProfitCriterion(), slicer, decisions);
! 		
  		StringBuffer html = new ReportHTMLGenerator().generate(report, criteria, "", urls);
  
--- 58,62 ----
  	public void testSMAGenerate() throws IOException {
  		Report report = new Report(new TotalProfitCriterion(), slicer, decisions);
! 
  		StringBuffer html = new ReportHTMLGenerator().generate(report, criteria, "", urls);
  
***************
*** 65,73 ****
  		assertTrue(html.toString().contains("report.html"));
  	}
! 	
  	@Test
  	public void testSMAGenerateWithoutCriteria() throws IOException {
  		Report report = new Report(new TotalProfitCriterion(), slicer, decisions);
! 		
  		StringBuffer html = new ReportHTMLGenerator().generate(report, "", urls);
  
--- 65,73 ----
  		assertTrue(html.toString().contains("report.html"));
  	}
! 
  	@Test
  	public void testSMAGenerateWithoutCriteria() throws IOException {
  		Report report = new Report(new TotalProfitCriterion(), slicer, decisions);
! 
  		StringBuffer html = new ReportHTMLGenerator().generate(report, "", urls);
  

Index: ReportImageTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/ReportImageTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ReportImageTest.java	27 Sep 2007 12:54:02 -0000	1.4
--- ReportImageTest.java	3 Oct 2007 22:56:47 -0000	1.5
***************
*** 10,14 ****
  import net.sf.tail.Operation;
  import net.sf.tail.OperationType;
! import net.sf.tail.SlicerType;
  import net.sf.tail.Trade;
  import net.sf.tail.analysis.criteria.TotalProfitCriterion;
--- 10,14 ----
  import net.sf.tail.Operation;
  import net.sf.tail.OperationType;
! import net.sf.tail.TimeSeriesSlicer;
  import net.sf.tail.Trade;
  import net.sf.tail.analysis.criteria.TotalProfitCriterion;
***************
*** 16,20 ****
  import net.sf.tail.runner.HistoryRunner;
  import net.sf.tail.sample.SampleTimeSeries;
! import net.sf.tail.series.SlicerByTimePeriod;
  import net.sf.tail.strategy.FakeStrategy;
  
--- 16,20 ----
  import net.sf.tail.runner.HistoryRunner;
  import net.sf.tail.sample.SampleTimeSeries;
! import net.sf.tail.series.FullyMemorizedSlicer;
  import net.sf.tail.strategy.FakeStrategy;
  
***************
*** 26,41 ****
  
  	private Report report;
! 	
  	private Period period;
! 	
  	private ReportImage image;
! 	
  	protected static final String FM_REPORT_DIR = "reports" + File.separatorChar;
  
  	protected static final String FM_CHART_DIR = "PNGCharts" + File.separatorChar;
! 	
  	@Before
! 	public void setUp() throws Exception 
! 	{
  		SampleTimeSeries series = new SampleTimeSeries();
  		List<Trade> trades = new ArrayList<Trade>();
--- 26,40 ----
  
  	private Report report;
! 
  	private Period period;
! 
  	private ReportImage image;
! 
  	protected static final String FM_REPORT_DIR = "reports" + File.separatorChar;
  
  	protected static final String FM_CHART_DIR = "PNGCharts" + File.separatorChar;
! 
  	@Before
! 	public void setUp() throws Exception {
  		SampleTimeSeries series = new SampleTimeSeries();
  		List<Trade> trades = new ArrayList<Trade>();
***************
*** 48,73 ****
  				new TotalProfitCriterion(), trades, new HistoryRunner(OperationType.BUY));
  		decisions.add(decision);
! 		SlicerByTimePeriod slicer = new SlicerByTimePeriod(series, period, SlicerType.MEMORIZED);
! 		
! 		report = new Report(new TotalProfitCriterion(), slicer, decisions);		
  		image = new ReportImage();
  	}
  
  	@Test
! 	public void generateReport() throws IOException 
! 	{
  		File imageReport = image.generateImage(report, period);
! 		
  		assertTrue(imageReport.getAbsolutePath().endsWith(FM_REPORT_DIR + FM_CHART_DIR + report.getFileName() + ".png"));
  	}
! 	
  	@Test
! 	public void generateDecision() throws IOException 
! 	{
  		Decision decision = report.getDecisions().get(0);
  		File imageDecision = image.generateImage(decision);
! 		
! 		assertTrue(imageDecision.getAbsolutePath().endsWith(FM_REPORT_DIR + FM_CHART_DIR + decision.getFileName() + ".png"));
  	}
! 	
  }
--- 47,71 ----
  				new TotalProfitCriterion(), trades, new HistoryRunner(OperationType.BUY));
  		decisions.add(decision);
! 		TimeSeriesSlicer slicer = new FullyMemorizedSlicer(series, period);
! 
! 		report = new Report(new TotalProfitCriterion(), slicer, decisions);
  		image = new ReportImage();
  	}
  
  	@Test
! 	public void generateReport() throws IOException {
  		File imageReport = image.generateImage(report, period);
! 
  		assertTrue(imageReport.getAbsolutePath().endsWith(FM_REPORT_DIR + FM_CHART_DIR + report.getFileName() + ".png"));
  	}
! 
  	@Test
! 	public void generateDecision() throws IOException {
  		Decision decision = report.getDecisions().get(0);
  		File imageDecision = image.generateImage(decision);
! 
! 		assertTrue(imageDecision.getAbsolutePath().endsWith(
! 				FM_REPORT_DIR + FM_CHART_DIR + decision.getFileName() + ".png"));
  	}
! 
  }

Index: ReportTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/ReportTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ReportTest.java	4 Sep 2007 13:09:14 -0000	1.3
--- ReportTest.java	3 Oct 2007 22:56:47 -0000	1.4
***************
*** 9,13 ****
  import net.sf.tail.Operation;
  import net.sf.tail.OperationType;
! import net.sf.tail.SlicerType;
  import net.sf.tail.Trade;
  import net.sf.tail.analysis.criteria.TotalProfitCriterion;
--- 9,13 ----
  import net.sf.tail.Operation;
  import net.sf.tail.OperationType;
! import net.sf.tail.TimeSeriesSlicer;
  import net.sf.tail.Trade;
  import net.sf.tail.analysis.criteria.TotalProfitCriterion;
***************
*** 15,19 ****
  import net.sf.tail.runner.HistoryRunner;
  import net.sf.tail.sample.SampleTimeSeries;
! import net.sf.tail.series.SlicerByTimePeriod;
  import net.sf.tail.strategy.FakeStrategy;
  
--- 15,19 ----
  import net.sf.tail.runner.HistoryRunner;
  import net.sf.tail.sample.SampleTimeSeries;
! import net.sf.tail.series.FullyMemorizedSlicer;
  import net.sf.tail.strategy.FakeStrategy;
  
***************
*** 26,30 ****
  	private List<Decision> decisions;
  
! 	private SlicerByTimePeriod slicer;
  
  	private List<Trade> trades;
--- 26,30 ----
  	private List<Decision> decisions;
  
! 	private TimeSeriesSlicer slicer;
  
  	private List<Trade> trades;
***************
*** 41,45 ****
  				new TotalProfitCriterion(), trades, new HistoryRunner(OperationType.BUY));
  		decisions.add(decision);
! 		slicer = new SlicerByTimePeriod(series, new Period().withYears(1), SlicerType.MEMORIZED);
  	}
  
--- 41,45 ----
  				new TotalProfitCriterion(), trades, new HistoryRunner(OperationType.BUY));
  		decisions.add(decision);
! 		slicer = new FullyMemorizedSlicer(series, new Period().withYears(1));
  	}
  

Index: ReportGeneratorTest.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/ReportGeneratorTest.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** ReportGeneratorTest.java	22 Sep 2007 18:47:22 -0000	1.22
--- ReportGeneratorTest.java	3 Oct 2007 22:56:47 -0000	1.23
***************
*** 10,14 ****
  import net.sf.tail.Operation;
  import net.sf.tail.OperationType;
! import net.sf.tail.SlicerType;
  import net.sf.tail.Trade;
  import net.sf.tail.analysis.criteria.NumberOfTicksCriterion;
--- 10,14 ----
  import net.sf.tail.Operation;
  import net.sf.tail.OperationType;
! import net.sf.tail.TimeSeriesSlicer;
  import net.sf.tail.Trade;
  import net.sf.tail.analysis.criteria.NumberOfTicksCriterion;
***************
*** 17,21 ****
  import net.sf.tail.runner.HistoryRunner;
  import net.sf.tail.sample.SampleTimeSeries;
! import net.sf.tail.series.SlicerByTimePeriod;
  import net.sf.tail.strategy.FakeStrategy;
  
--- 17,21 ----
  import net.sf.tail.runner.HistoryRunner;
  import net.sf.tail.sample.SampleTimeSeries;
! import net.sf.tail.series.FullyMemorizedSlicer;
  import net.sf.tail.strategy.FakeStrategy;
  
***************
*** 28,35 ****
  	private List<Decision> decisions;
  
! 	private SlicerByTimePeriod slicer;
  
  	private List<AnalysisCriterion> criteria;
! 	
  	@Before
  	public void setUp() throws Exception {
--- 28,35 ----
  	private List<Decision> decisions;
  
! 	private TimeSeriesSlicer slicer;
  
  	private List<AnalysisCriterion> criteria;
! 
  	@Before
  	public void setUp() throws Exception {
***************
*** 43,48 ****
  				new TotalProfitCriterion(), trades, new HistoryRunner(OperationType.BUY));
  		decisions.add(decision);
! 		slicer = new SlicerByTimePeriod(series, new Period().withYears(1), SlicerType.MEMORIZED);
! 		
  		criteria = new ArrayList<AnalysisCriterion>();
  		criteria.add(new NumberOfTicksCriterion());
--- 43,48 ----
  				new TotalProfitCriterion(), trades, new HistoryRunner(OperationType.BUY));
  		decisions.add(decision);
! 		slicer = new FullyMemorizedSlicer(series, new Period().withYears(1));
! 
  		criteria = new ArrayList<AnalysisCriterion>();
  		criteria.add(new NumberOfTicksCriterion());
***************
*** 53,57 ****
  	public void testSMAGenerate() throws IOException {
  		Report report = new Report(new TotalProfitCriterion(), slicer, decisions);
! 		
  		StringBuffer html = new ReportHTMLGenerator().generate(report, criteria, "");
  
--- 53,57 ----
  	public void testSMAGenerate() throws IOException {
  		Report report = new Report(new TotalProfitCriterion(), slicer, decisions);
! 
  		StringBuffer html = new ReportHTMLGenerator().generate(report, criteria, "");
  
***************
*** 59,67 ****
  		assertTrue(html.toString().contains("4"));
  	}
! 	
  	@Test
  	public void testSMAGenerateWithoutCriteria() throws IOException {
  		Report report = new Report(new TotalProfitCriterion(), slicer, decisions);
! 		
  		StringBuffer html = new ReportHTMLGenerator().generate(report, "");
  
--- 59,67 ----
  		assertTrue(html.toString().contains("4"));
  	}
! 
  	@Test
  	public void testSMAGenerateWithoutCriteria() throws IOException {
  		Report report = new Report(new TotalProfitCriterion(), slicer, decisions);
! 
  		StringBuffer html = new ReportHTMLGenerator().generate(report, "");
  

[Tail-cvs] Tail/src/java/net/sf/tail/series PartialMemorizedSlicer.java, 1.1 RegularSlicer.java, 1.1 FullyMemorizedSlicer.java, 1.1 SlicerByTimePeriod.java, NONE

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

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

Added Files:
	PartialMemorizedSlicer.java RegularSlicer.java 
	FullyMemorizedSlicer.java 
Removed Files:
	SlicerByTimePeriod.java 
Log Message:
Refatoração dos Slicer

--- NEW FILE: RegularSlicer.java ---
package net.sf.tail.series;

import net.sf.tail.TimeSeries;

import org.joda.time.DateTime;
import org.joda.time.Period;

public class RegularSlicer extends PartialMemorizedSlicer {


	public RegularSlicer(TimeSeries series, Period period, DateTime begin) {
		super(series, period, begin, 1);
	}

	public RegularSlicer(TimeSeries series, Period period) {
		this(series, period, series.getTick(0).getDate());
	}

//	public String getName() {
//		String sPeriod = "";
//		sPeriod = periodToString(sPeriod);
//		return this.getClass().getSimpleName() + " Period: " + sPeriod;
//	}
//
//	private String periodToString(String sPeriod) {
//		if (period.getYears() > 0)
//			sPeriod += period.getYears() + " year(s) ,";
//		if (period.getMonths() > 0)
//			sPeriod += period.getMonths() + " month(s) ,";
//		if (period.getDays() > 0)
//			sPeriod += period.getDays() + " day(s) ,";
//		if (period.getHours() > 0)
//			sPeriod += period.getHours() + " day(s) ,";
//		if (period.getMinutes() > 0)
//			sPeriod += period.getMinutes() + " day(s) ,";
//		return sPeriod.substring(0, sPeriod.length() - 2);
//	}

//	public String getPeriodName() {
//		return this.periodBegin.toString("hh:mm dd/MM/yyyy - ")
//				+ series.getTick(series.getEnd()).getDate().toString("hh:mm dd/MM/yyyy");
//	}
}

--- NEW FILE: PartialMemorizedSlicer.java ---
package net.sf.tail.series;

import java.util.ArrayList;
import java.util.List;

import net.sf.tail.ConstrainedTimeSeries;
import net.sf.tail.TimeSeries;
import net.sf.tail.TimeSeriesSlicer;

import org.joda.time.DateTime;
import org.joda.time.Interval;
import org.joda.time.Period;

public class PartialMemorizedSlicer implements TimeSeriesSlicer{
	protected transient TimeSeries series;

	protected Period period;

	protected transient List<TimeSeries> splittedSeries;

	protected DateTime periodBegin;
	
	protected int periodsPerSlice;

	//private transient static Logger LOG = Logger.getLogger(PartialMemorizedSlicer.class);
	
	public PartialMemorizedSlicer(TimeSeries series, Period period,DateTime periodBegin, int periodsPerSlice) {
		this.series = series;
		this.period = period;
		this.splittedSeries = new ArrayList<TimeSeries>();
		this.periodBegin = periodBegin;
		this.periodsPerSlice = periodsPerSlice;
		split();
	}
	
	public PartialMemorizedSlicer(TimeSeries series, Period period, int periodsPerSlice) {
		this(series, period, series.getTick(series.getBegin()).getDate(), periodsPerSlice);
	}

	private void split() {
//		LOG.debug(String.format("Spliting %s  ", series));

		DateTime begin = periodBegin;
		DateTime end = begin.plus(period);

		Interval interval = new Interval(begin, end);
		int index = series.getBegin();

		while (series.getTick(index).getDate().isBefore(interval.getStart()))
			index++;

		int sliceBeginIndex = index;

		List<Integer> begins = new ArrayList<Integer>(); 
		begins.add(index);
		while (index <= series.getEnd()) {

			if (interval.contains(series.getTick(index).getDate())) {
				index++;
			} else if (end.plus(period).isAfter(series.getTick(index).getDate())) {
				createSlice(begins.get(Math.max(begins.size() - periodsPerSlice, 0)), index - 1);

//				LOG.debug(String.format("Interval %s before  %s ", interval, series.getTick(index).getDate()));
				
				sliceBeginIndex = index;
				begins.add(sliceBeginIndex);
				begin = end;
				end = begin.plus(period);
				interval = new Interval(begin, end);
				index++;
			} else {
				begin = end;
				end = begin.plus(period);
				interval = new Interval(begin, end);
			}
		}
		createSlice(begins.get(Math.max(begins.size() - periodsPerSlice, 0)), series.getEnd());
	}

	private void createSlice(int begin, int end) {
//		LOG.debug(String.format("New series from %d to %d ", begin, end));
		ConstrainedTimeSeries slice = new ConstrainedTimeSeries(series, begin, end);
		splittedSeries.add(slice);
	}

	public TimeSeriesSlicer applyForSeries(TimeSeries series) {
		return new PartialMemorizedSlicer(series, this.period, this.periodBegin, this.periodsPerSlice);
	}

	public String getName() {
		String sPeriod = "";
		sPeriod = periodToString(sPeriod);
		return this.getClass().getSimpleName() + " Period: " + sPeriod;
	}

	public Period getPeriod() {
		return period;
	}

	public String getPeriodName() {
		return this.periodBegin.toString("hh:mm dd/MM/yyyy - ")
				+ series.getTick(series.getEnd()).getDate().toString("hh:mm dd/MM/yyyy");
	}

	public TimeSeries getSeries() {
		return series;
	}

	public TimeSeries getSlice(int position) {
		return splittedSeries.get(position);
	}

	public int getSlices() {
		return splittedSeries.size();
	}

	protected String periodToString(String sPeriod) {
		if (period.getYears() > 0)
			sPeriod += period.getYears() + " year(s) ,";
		if (period.getMonths() > 0)
			sPeriod += period.getMonths() + " month(s) ,";
		if (period.getDays() > 0)
			sPeriod += period.getDays() + " day(s) ,";
		if (period.getHours() > 0)
			sPeriod += period.getHours() + " day(s) ,";
		if (period.getMinutes() > 0)
			sPeriod += period.getMinutes() + " day(s) ,";
		return sPeriod.substring(0, sPeriod.length() - 2);
	}
	
	@Override
	public int hashCode() {
		final int prime = 31;
		int result = 1;
		result = prime * result + ((period == null) ? 0 : period.hashCode());
		result = prime * result + ((periodBegin == null) ? 0 : periodBegin.hashCode());
		return result;
	}

	@Override
	public boolean equals(Object obj) {
		if (this == obj)
			return true;
		if (obj == null)
			return false;
		if (!(obj instanceof PartialMemorizedSlicer))
			return false;
		final PartialMemorizedSlicer other = (PartialMemorizedSlicer) obj;
		if (period == null) {
			if (other.period != null)
				return false;
		} else if (!period.equals(other.period))
			return false;
		if (periodBegin == null) {
			if (other.periodBegin != null)
				return false;
		} else if (!periodBegin.equals(other.periodBegin))
			return false;
		return true;
	}

	
	
	
	
	
}

--- SlicerByTimePeriod.java DELETED ---

--- NEW FILE: FullyMemorizedSlicer.java ---
package net.sf.tail.series;

import net.sf.tail.TimeSeries;

import org.joda.time.DateTime;
import org.joda.time.Period;

public class FullyMemorizedSlicer extends PartialMemorizedSlicer {


	public FullyMemorizedSlicer(TimeSeries series, Period period, DateTime begin) {
		super(series, period, begin, series.getSize());
	}

	public FullyMemorizedSlicer(TimeSeries series, Period period) {
		this(series, period, series.getTick(0).getDate());
	}

//	public String getName() {
//		String sPeriod = "";
//		sPeriod = periodToString(sPeriod);
//		return this.getClass().getSimpleName() + " Period: " + sPeriod;
//	}
//
//	private String periodToString(String sPeriod) {
//		if (period.getYears() > 0)
//			sPeriod += period.getYears() + " year(s) ,";
//		if (period.getMonths() > 0)
//			sPeriod += period.getMonths() + " month(s) ,";
//		if (period.getDays() > 0)
//			sPeriod += period.getDays() + " day(s) ,";
//		if (period.getHours() > 0)
//			sPeriod += period.getHours() + " day(s) ,";
//		if (period.getMinutes() > 0)
//			sPeriod += period.getMinutes() + " day(s) ,";
//		return sPeriod.substring(0, sPeriod.length() - 2);
//	}

//	public String getPeriodName() {
//		return this.periodBegin.toString("hh:mm dd/MM/yyyy - ")
//				+ series.getTick(series.getEnd()).getDate().toString("hh:mm dd/MM/yyyy");
//	}
}

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

[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-serv31868/src/java/net/sf/tails/i18n

Modified Files:
	DSL_IDE.properties 
Log Message:
criando métodos helpers em ruby para o TailS

Index: DSL_IDE.properties
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/i18n/DSL_IDE.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DSL_IDE.properties	3 Oct 2007 19:12:06 -0000	1.1
--- DSL_IDE.properties	3 Oct 2007 22:30:54 -0000	1.2
***************
*** 1,3 ****
  
  RUBY_KEYWORDS= alias and begin break case catch class def do elsif else fail ensure for end if in module next not or raise redo rescue retry return then throw super unless undef until when while yield
! TAIL_KEYWORDS= ema sma 
\ No newline at end of file
--- 1,3 ----
  
  RUBY_KEYWORDS= alias and begin break case catch class def do elsif else fail ensure for end if in module next not or raise redo rescue retry return then throw super unless undef until when while yield
! TAIL_KEYWORDS= averageGain averageLoss max min averageDirectionalMovement directionalMovement onBalanceVolume standartDeviation ema parabolicSAR RSI close amount maxPrice minPrice openPrice volume sma WilliamsR cross
\ No newline at end of file

[Tail-cvs] Tail/dsl rubyDSLutils.rb,1.4

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

Update of /cvsroot/tail/Tail/dsl
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31821/dsl

Modified Files:
	rubyDSLutils.rb 
Log Message:
criando métodos helpers em ruby para o TailS

Index: rubyDSLutils.rb
===================================================================
RCS file: /cvsroot/tail/Tail/dsl/rubyDSLutils.rb,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rubyDSLutils.rb	3 Oct 2007 18:58:32 -0000	1.3
--- rubyDSLutils.rb	3 Oct 2007 22:30:34 -0000	1.4
***************
*** 11,20 ****
  end
  
! def ema (number)
! 	Tail::EMAIndicator.new($close, number)
  end
  
! def sma (number)
! 	Tail::SMAIndicator.new($close, number)
  end
  
--- 11,96 ----
  end
  
! def averageGain(timeFrame)
! 	Tail::AverageGainIndicator.new($close, timeFrame)
  end
  
! def averageGain
! 	Tail::AverageGainIndicator.new($close, $series.getSize())
! end
! 
! def averageLoss(timeFrame)
! 	Tail::AverageLossIndicator.new($close, timeFrame)
! end
! 
! def averageLoss
! 	Tail::AverageLossIndicator.new($close, $series.getSize())
! end
! 
! def max(indicator)
! 	Tail::HighestValueIndicator.new(indicator, $series.getSize())
! end
! 
! def min(indicator)
! 	Tail::LowestValueIndicator.new(indicator, $series.getSize())
! end
! 
! def averageDirectionalMovement(timeFrame)
! 	Tail::AverageDirectionalMovementIndicator.new($series, timeFrame)
! end
! 
! def directionalMovement(timeFrame)
! 	Tail::DirectionalMovementIndicator.new($series, timeFrame)
! end
! 
! def onBalanceVolume
! 	Tail::OnBalanceVolumeIndicator.new($series)
! end
! 
! def standartDeviation(indicator, timeFrame)
! 	Tail::StandartDeviationIndicator.new(indicator, timeFrame)
! end
! 
! def ema(timeFrame)
! 	Tail::EMAIndicator.new($close, timeFrame)
! end
! 
! def parabolicSAR
! 	Tail::ParabolicSarIndicator.new($series)
! end
! 
! def RSI(timeFrame)
! 	Tail::RSIIndicator.new(close, timeFrame)
! end
! 
! def close
! 	Tail::ClosePriceIndicator.new($series)
! end
! 
! def amount
! 	Tail::AmountIndicator.new($series)
! end
! 
! def maxPrice
! 	Tail::MaxPriceIndicator.new($series)
! end
! 
! def minPrice
! 	Tail::MinPriceIndicator.new($series)
! end
! 
! def openPrice
! 	Tail::OpenPriceIndicator.new($series)
! end
! 
! def volume
! 	Tail::VolumeIndicator.new($series)
! end
! 
! def sma (timeFrame)
! 	Tail::SMAIndicator.new($close, timeFrame)
! end
! 
! def WilliamsR(timeFrame)
! 	Tail::WilliamsRIndicator.new($close, timeFrame)
  end
  

[Tail-cvs] Tail/src/test/net/sf/tail/dsl/ruby EMAStrategies3.rb, 1.4

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

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

Modified Files:
	EMAStrategies3.rb 
Log Message:
criando métodos helpers em ruby para o TailS

Index: EMAStrategies3.rb
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/dsl/ruby/EMAStrategies3.rb,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EMAStrategies3.rb	26 Sep 2007 19:36:20 -0000	1.3
--- EMAStrategies3.rb	3 Oct 2007 22:30:33 -0000	1.4
***************
*** 1,5 ****
  
  (1..50).collect{|numero| 
! 	$strategies.add(cross($close, ema(numero)))
  }
  
--- 1,5 ----
  
  (1..50).collect{|numero| 
! 	$strategies.add(cross(close, ema(numero)))
  }
  

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

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

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

Modified Files:
	FrameHelper.java 
Log Message:
Mais ajustes de tela...

Index: FrameHelper.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper/FrameHelper.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FrameHelper.java	3 Oct 2007 21:10:18 -0000	1.11
--- FrameHelper.java	3 Oct 2007 22:04:10 -0000	1.12
***************
*** 49,52 ****
--- 49,70 ----
  		return criteria;
  	}
+ 	
+ //	public static List<String> getCriteriaFilesTeste() throws ClassNotFoundException {
+ //		List<String> classes = new ArrayList<String>();
+ //		ClassLoader cld = Thread.currentThread().getContextClassLoader();
+ //		String path = '/' + packageBundle.getString("CRITERIA_PACKAGE")
+ //				.replace('.', '/');
+ //		URL resource = cld.getResource(path);
+ //		File directory = new File(resource.getFile());
+ //		if (directory.exists()) {
+ //			String[] files = directory.list();
+ //			for (int i = 0; i < files.length; i++) {
+ //				if (files[i].endsWith(".class")) {
+ //					classes.add(files[i].split(".class")[0]);
+ //				}
+ //			}
+ //		}
+ //		return classes;
+ //	}  
  
  	public static List<String> getLoaderFiles() {

[Tail-cvs] TailS/src/java/net/sf/tails/swing/frame/stockAnalysis NewStockAnalysis2.java, 1.3 NewStockAnalysis.java, 1.4

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

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

Modified Files:
	NewStockAnalysis2.java NewStockAnalysis.java 
Log Message:
Mais ajustes de tela...

Index: NewStockAnalysis2.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NewStockAnalysis2.java	3 Oct 2007 20:48:43 -0000	1.2
--- NewStockAnalysis2.java	3 Oct 2007 22:04:10 -0000	1.3
***************
*** 140,144 ****
  			selectedCriterion = FrameHelper.getSelectedCriterion(analysisComboBox.getSelectedItem().toString());
  		} catch (Exception e) {
! 			JOptionPane.showMessageDialog(null, analysisComboBox.getSelectedItem().toString() + messageBundle.getString("SELECTED_CRITERION"), "Error", 0);
  		}
      	List<AnalysisCriterion> additionalCriteria = new ArrayList<AnalysisCriterion>();
--- 140,144 ----
  			selectedCriterion = FrameHelper.getSelectedCriterion(analysisComboBox.getSelectedItem().toString());
  		} catch (Exception e) {
! 			JOptionPane.showMessageDialog(null, analysisComboBox.getSelectedItem().toString() + " " + messageBundle.getString("SELECTED_CRITERION"), "Error", 0);
  		}
      	List<AnalysisCriterion> additionalCriteria = new ArrayList<AnalysisCriterion>();
***************
*** 153,157 ****
  						criterion = FrameHelper.getSelectedCriterion(checkBox.getText());
  					} catch (Exception e) {
! 						JOptionPane.showMessageDialog(null, checkBox.getText() + messageBundle.getString("SELECTED_CRITERIA"), "Error", 2);
  					}
  					
--- 153,157 ----
  						criterion = FrameHelper.getSelectedCriterion(checkBox.getText());
  					} catch (Exception e) {
! 						JOptionPane.showMessageDialog(null, checkBox.getText() + " " + messageBundle.getString("SELECTED_CRITERIA"), "Error", 2);
  					}
  					
***************
*** 165,169 ****
      	if (selectedCriterion == null)
      	{
!     		JOptionPane.showMessageDialog(null, analysisComboBox.getSelectedItem().toString() + messageBundle.getString("SELECTED_CRITERION"), "Error", 0);
      	}
      	else
--- 165,169 ----
      	if (selectedCriterion == null)
      	{
!     		JOptionPane.showMessageDialog(null, analysisComboBox.getSelectedItem().toString() + " " + messageBundle.getString("SELECTED_CRITERION"), "Error", 0);
      	}
      	else

Index: NewStockAnalysis.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NewStockAnalysis.java	3 Oct 2007 21:10:18 -0000	1.3
--- NewStockAnalysis.java	3 Oct 2007 22:04:10 -0000	1.4
***************
*** 292,296 ****
  						stock = new Stock(stockNameField.getText(), seriesField.getText(), FrameHelper.getSelectedLoader(seriesFormatComboBox.getSelectedItem().toString()));
  						String xmlFile = stockSerializer.toXML(stock);
! 		                String filePath = folderBundle.getString("STOCK_DIR") + stockNameField.getText();
  		            	File stockAnalysisXML = new File(filePath + ".xml");
  		        		OutputStream out;
--- 292,296 ----
  						stock = new Stock(stockNameField.getText(), seriesField.getText(), FrameHelper.getSelectedLoader(seriesFormatComboBox.getSelectedItem().toString()));
  						String xmlFile = stockSerializer.toXML(stock);
! 		                String filePath = folderBundle.getString("STOCK_DIR") + "/" + stockNameField.getText();
  		            	File stockAnalysisXML = new File(filePath + ".xml");
  		        		OutputStream out;

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

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

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

Modified Files:
	Messages.properties 
Log Message:
Mais ajustes de tela...

Index: Messages.properties
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/i18n/Messages.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Messages.properties	3 Oct 2007 20:48:43 -0000	1.1
--- Messages.properties	3 Oct 2007 22:04:10 -0000	1.2
***************
*** 9,14 ****
  STOCK_ADDRESS =Please enter stock adress.
  STOCK_FILE =Invalid stock file, please select a valid one.
! SELECTED_CRITERION = doesn't exists in library, choose another one.
! SELECTED_CRITERIA = doesn't exists in library, list may be incomplete.
  START_DATE =Please enter a valid start date (dd/mm/yyyy).
  PERIOD_FIELDS =Please fill all Slices Period fields (zero if not using it).
--- 9,14 ----
  STOCK_ADDRESS =Please enter stock adress.
  STOCK_FILE =Invalid stock file, please select a valid one.
! SELECTED_CRITERION =doesn't exists in library, choose another one.
! SELECTED_CRITERIA =doesn't exists in library, list may be incomplete.
  START_DATE =Please enter a valid start date (dd/mm/yyyy).
  PERIOD_FIELDS =Please fill all Slices Period fields (zero if not using it).

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

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

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

Modified Files:
	Index.java 
Log Message:
Adicionado mkdirs em todos lugares necessários... assim não há mais exception de uma pasta não existir no TailS.

Index: Index.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/Index.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Index.java	3 Oct 2007 20:48:44 -0000	1.14
--- Index.java	3 Oct 2007 21:10:19 -0000	1.15
***************
*** 37,40 ****
--- 37,41 ----
  
  public class Index extends javax.swing.JFrame {
+ 	private static final ResourceBundle folderBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Folders");
  	private static final ResourceBundle messageBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Messages");
  	
***************
*** 46,49 ****
--- 47,51 ----
      private javax.swing.JMenu newMenu;
      private javax.swing.JMenuItem newStockAnalysisMenuItem;
+     private javax.swing.JMenuItem newReportMenuItem;
      private javax.swing.JMenuItem openMenuItem;
      private javax.swing.JSeparator separator1;
***************
*** 95,98 ****
--- 97,101 ----
      	newMenu = new javax.swing.JMenu();
      	newStockAnalysisMenuItem = new javax.swing.JMenuItem();
+     	newReportMenuItem = new javax.swing.JMenuItem();
      	openMenuItem = new javax.swing.JMenuItem();
          separator1 = new javax.swing.JSeparator();
***************
*** 153,157 ****
          addReportButton.addActionListener(new java.awt.event.ActionListener() {
              public void actionPerformed(java.awt.event.ActionEvent evt) {
!                 addReportButtonActionPerformed(evt);
              }
          });
--- 156,160 ----
          addReportButton.addActionListener(new java.awt.event.ActionListener() {
              public void actionPerformed(java.awt.event.ActionEvent evt) {
!                 newReportActionPerformed(evt);
              }
          });
***************
*** 178,181 ****
--- 181,185 ----
          newMenu.setText("New...");
          newStockAnalysisMenuItem.setText("Stock Analysis");
+         newStockAnalysisMenuItem.setMnemonic('t');
          newStockAnalysisMenuItem.addActionListener(new java.awt.event.ActionListener() {
              public void actionPerformed(java.awt.event.ActionEvent evt) {
***************
*** 183,188 ****
--- 187,201 ----
              }
          });
+         
+         newReportMenuItem.setText("Report");
+         newReportMenuItem.setMnemonic('r');
+         newReportMenuItem.addActionListener(new java.awt.event.ActionListener() {
+             public void actionPerformed(java.awt.event.ActionEvent evt) {
+                 newReportActionPerformed(evt);
+             }
+         });
  
          newMenu.add(newStockAnalysisMenuItem);
+         newMenu.add(newReportMenuItem);
  
          fileMenu.add(newMenu);
***************
*** 291,295 ****
  						public void run() {
  							try {
! 								new File("Data/Xls").mkdirs();
  								HSSFWorkbook workbook = xlsGenerator.generate(report, stockAnalysis.getAdditionalCriteria(), stockAnalysis.getSlicer().getPeriod());
  								FileOutputStream fileOut = new FileOutputStream(xlsFileChooser.getSelectedFile().getAbsolutePath() + ".xls");
--- 304,308 ----
  						public void run() {
  							try {
! 								FrameHelper.generateFolders(folderBundle.getString("XLS_DIR"));
  								HSSFWorkbook workbook = xlsGenerator.generate(report, stockAnalysis.getAdditionalCriteria(), stockAnalysis.getSlicer().getPeriod());
  								FileOutputStream fileOut = new FileOutputStream(xlsFileChooser.getSelectedFile().getAbsolutePath() + ".xls");
***************
*** 329,333 ****
      }                                          
  
!     private void addReportButtonActionPerformed(java.awt.event.ActionEvent evt) {     
      	if(stockAnalysis == null)
      	{
--- 342,346 ----
      }                                          
  
!     private void newReportActionPerformed(java.awt.event.ActionEvent evt) {     
      	if(stockAnalysis == null)
      	{

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

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

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

Modified Files:
	Folders.properties 
Log Message:
Adicionado mkdirs em todos lugares necessários... assim não há mais exception de uma pasta não existir no TailS.

Index: Folders.properties
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/i18n/Folders.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Folders.properties	3 Oct 2007 20:48:43 -0000	1.1
--- Folders.properties	3 Oct 2007 21:10:19 -0000	1.2
***************
*** 3,5 ****
  STOCKANALYSIS_DIR =Data/StockAnalysis
  STOCK_DIR =Data/Stock
! BOVESPA_DIR =Data/Bovespa
\ No newline at end of file
--- 3,6 ----
  STOCKANALYSIS_DIR =Data/StockAnalysis
  STOCK_DIR =Data/Stock
! BOVESPA_DIR =Data/Bovespa
! XLS_DIR =Data/Xls
\ No newline at end of file

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

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

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

Modified Files:
	NewStockAnalysis.java 
Log Message:
Adicionado mkdirs em todos lugares necessários... assim não há mais exception de uma pasta não existir no TailS.

Index: NewStockAnalysis.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NewStockAnalysis.java	3 Oct 2007 20:48:43 -0000	1.2
--- NewStockAnalysis.java	3 Oct 2007 21:10:18 -0000	1.3
***************
*** 289,292 ****
--- 289,293 ----
  	    		{
  					try {
+ 		                FrameHelper.generateFolders(folderBundle.getString("STOCK_DIR"));
  						stock = new Stock(stockNameField.getText(), seriesField.getText(), FrameHelper.getSelectedLoader(seriesFormatComboBox.getSelectedItem().toString()));
  						String xmlFile = stockSerializer.toXML(stock);

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

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

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

Modified Files:
	FrameHelper.java 
Log Message:
Adicionado mkdirs em todos lugares necessários... assim não há mais exception de uma pasta não existir no TailS.

Index: FrameHelper.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper/FrameHelper.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** FrameHelper.java	3 Oct 2007 20:48:43 -0000	1.10
--- FrameHelper.java	3 Oct 2007 21:10:18 -0000	1.11
***************
*** 38,42 ****
  	public static List<String> getCriteriaFiles() {
  		List<String> criteria = new ArrayList<String>();
! 		new File(folderBundle.getString("CRITERIA_DIR")).mkdirs();
  		File[] files = new File(folderBundle.getString("CRITERIA_DIR")).listFiles();
  
--- 38,42 ----
  	public static List<String> getCriteriaFiles() {
  		List<String> criteria = new ArrayList<String>();
! 		generateFolders(folderBundle.getString("CRITERIA_DIR"));
  		File[] files = new File(folderBundle.getString("CRITERIA_DIR")).listFiles();
  
***************
*** 149,153 ****
  
  	public static String generateStockAnalysisName() {
! 		new File(folderBundle.getString("STOCKANALYSIS_DIR")).mkdirs();
  		File[] files = new File(folderBundle.getString("STOCKANALYSIS_DIR")).listFiles();
  		int j = 0;
--- 149,153 ----
  
  	public static String generateStockAnalysisName() {
! 		generateFolders(folderBundle.getString("STOCKANALYSIS_DIR"));
  		File[] files = new File(folderBundle.getString("STOCKANALYSIS_DIR")).listFiles();
  		int j = 0;
***************
*** 163,170 ****
  	
  	public static String getStockAnalysisPath(){
! 		new File(folderBundle.getString("STOCKANALYSIS_DIR")).mkdirs();
  		File path = new File(folderBundle.getString("STOCKANALYSIS_DIR"));
  		return path.getAbsolutePath();
  	}
  	
  }
--- 163,175 ----
  	
  	public static String getStockAnalysisPath(){
! 		generateFolders(folderBundle.getString("STOCKANALYSIS_DIR"));
  		File path = new File(folderBundle.getString("STOCKANALYSIS_DIR"));
  		return path.getAbsolutePath();
  	}
  	
+ 	public static void generateFolders(String path)
+ 	{
+ 		new File(path).mkdirs();
+ 	}
+ 	
  }

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

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

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

Modified Files:
	FrameHelper.java 
Log Message:
Atualizando telas que tinha algo hard coded e jogadas para arquivos de properties (mensagens de erro, pastas e packages etc).

Index: FrameHelper.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper/FrameHelper.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FrameHelper.java	3 Oct 2007 18:51:52 -0000	1.9
--- FrameHelper.java	3 Oct 2007 20:48:43 -0000	1.10
***************
*** 15,18 ****
--- 15,19 ----
  import java.util.ArrayList;
  import java.util.List;
+ import java.util.ResourceBundle;
  
  import javax.swing.table.DefaultTableModel;
***************
*** 32,45 ****
  public class FrameHelper {
  
! 	static final String CRITERIA_DIR = "Data/Criteria";
! 	static final String LOADER_DIR = "Data/Loaders";
! 	static final String STOCKANALYSIS_DIR = "Data/StockAnalysis";
! 	static final String CRITERIA_PACKAGE = "net.sf.tail.analysis.criteria.";
! 	static final String LOADER_PACKAGE = "net.sf.tail.io.reader.";
  
  	public static List<String> getCriteriaFiles() {
  		List<String> criteria = new ArrayList<String>();
! 		new File(CRITERIA_DIR).mkdirs();
! 		File[] files = new File(CRITERIA_DIR).listFiles();
  
  		for (int i = 0; i < files.length; i++) {
--- 33,43 ----
  public class FrameHelper {
  
! 	private static final ResourceBundle folderBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Folders");
! 	private static final ResourceBundle packageBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Packages");
  
  	public static List<String> getCriteriaFiles() {
  		List<String> criteria = new ArrayList<String>();
! 		new File(folderBundle.getString("CRITERIA_DIR")).mkdirs();
! 		File[] files = new File(folderBundle.getString("CRITERIA_DIR")).listFiles();
  
  		for (int i = 0; i < files.length; i++) {
***************
*** 54,59 ****
  	public static List<String> getLoaderFiles() {
  		List<String> loaders = new ArrayList<String>();
! 		new File(LOADER_DIR).mkdirs();
! 		File[] files = new File(LOADER_DIR).listFiles();
  
  		for (int i = 0; i < files.length; i++) {
--- 52,57 ----
  	public static List<String> getLoaderFiles() {
  		List<String> loaders = new ArrayList<String>();
! 		new File(folderBundle.getString("LOADER_DIR")).mkdirs();
! 		File[] files = new File(folderBundle.getString("LOADER_DIR")).listFiles();
  
  		for (int i = 0; i < files.length; i++) {
***************
*** 69,73 ****
  			throws InstantiationException, IllegalAccessException,
  			ClassNotFoundException {
! 		Class<?> cls = Class.forName(CRITERIA_PACKAGE + criterionName);
  		Object object = cls.newInstance();
  
--- 67,71 ----
  			throws InstantiationException, IllegalAccessException,
  			ClassNotFoundException {
! 		Class<?> cls = Class.forName(packageBundle.getString("CRITERIA_PACKAGE") + criterionName);
  		Object object = cls.newInstance();
  
***************
*** 81,85 ****
  			throws InstantiationException, IllegalAccessException,
  			ClassNotFoundException {
! 		Class<?> cls = Class.forName(LOADER_PACKAGE + loaderName);
  		Object object = cls.newInstance();
  
--- 79,83 ----
  			throws InstantiationException, IllegalAccessException,
  			ClassNotFoundException {
! 		Class<?> cls = Class.forName(packageBundle.getString("LOADER_PACKAGE") + loaderName);
  		Object object = cls.newInstance();
  
***************
*** 151,156 ****
  
  	public static String generateStockAnalysisName() {
! 		new File(STOCKANALYSIS_DIR).mkdirs();
! 		File[] files = new File(STOCKANALYSIS_DIR).listFiles();
  		int j = 0;
  
--- 149,154 ----
  
  	public static String generateStockAnalysisName() {
! 		new File(folderBundle.getString("STOCKANALYSIS_DIR")).mkdirs();
! 		File[] files = new File(folderBundle.getString("STOCKANALYSIS_DIR")).listFiles();
  		int j = 0;
  
***************
*** 165,170 ****
  	
  	public static String getStockAnalysisPath(){
! 		new File(STOCKANALYSIS_DIR).mkdirs();
! 		File path = new File(STOCKANALYSIS_DIR);
  		return path.getAbsolutePath();
  	}
--- 163,168 ----
  	
  	public static String getStockAnalysisPath(){
! 		new File(folderBundle.getString("STOCKANALYSIS_DIR")).mkdirs();
! 		File path = new File(folderBundle.getString("STOCKANALYSIS_DIR"));
  		return path.getAbsolutePath();
  	}

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

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

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

Modified Files:
	Index.java 
Log Message:
Atualizando telas que tinha algo hard coded e jogadas para arquivos de properties (mensagens de erro, pastas e packages etc).

Index: Index.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/Index.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Index.java	1 Oct 2007 23:16:58 -0000	1.13
--- Index.java	3 Oct 2007 20:48:44 -0000	1.14
***************
*** 19,22 ****
--- 19,23 ----
  import java.io.OutputStream;
  import java.io.PrintWriter;
+ import java.util.ResourceBundle;
  
  import javax.swing.JFileChooser;
***************
*** 36,40 ****
  
  public class Index extends javax.swing.JFrame {
! 	static final String DEFAULT_TITLE = "TailS : Technical Analysis Library Software";
  	
  	private static final long serialVersionUID = 1L;
--- 37,41 ----
  
  public class Index extends javax.swing.JFrame {
! 	private static final ResourceBundle messageBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Messages");
  	
  	private static final long serialVersionUID = 1L;
***************
*** 71,75 ****
          this.setLocationByPlatform(true);
          this.setMinimumSize(new java.awt.Dimension(800, 600));
!         this.setTitle(DEFAULT_TITLE);
      }
      
--- 72,76 ----
          this.setLocationByPlatform(true);
          this.setMinimumSize(new java.awt.Dimension(800, 600));
!         this.setTitle(messageBundle.getString("DEFAULT_TITLE"));
      }
      
***************
*** 80,84 ****
          this.setLocationByPlatform(true);
          this.setMinimumSize(new java.awt.Dimension(800, 600));
!         this.setTitle(DEFAULT_TITLE);
  	}
  
--- 81,85 ----
          this.setLocationByPlatform(true);
          this.setMinimumSize(new java.awt.Dimension(800, 600));
!         this.setTitle(messageBundle.getString("DEFAULT_TITLE"));
  	}
  
***************
*** 275,279 ****
      	if (reportTable.getSelectedRow() == -1)
      	{
!     		JOptionPane.showMessageDialog(null, "Please select the report you want to export to XLS.", "Error", 2);
      	}
      	else
--- 276,280 ----
      	if (reportTable.getSelectedRow() == -1)
      	{
!     		JOptionPane.showMessageDialog(null, messageBundle.getString("REPORT_XLS"), "Error", 2);
      	}
      	else
***************
*** 308,312 ****
      	if (reportTable.getSelectedRow() == -1)
      	{
!     		JOptionPane.showMessageDialog(null, "Please select the report you want to export to HTML.", "Error", 2);
      	}
      	else
--- 309,313 ----
      	if (reportTable.getSelectedRow() == -1)
      	{
!     		JOptionPane.showMessageDialog(null, messageBundle.getString("REPORT_HTML"), "Error", 2);
      	}
      	else
***************
*** 331,335 ****
      	if(stockAnalysis == null)
      	{
!     		JOptionPane.showMessageDialog(null, "Please open or create a new stock analysis to generate a report.", "Error", 2);
      	}
      	else
--- 332,336 ----
      	if(stockAnalysis == null)
      	{
!     		JOptionPane.showMessageDialog(null, messageBundle.getString("OPEN_STOCKANALYSIS"), "Error", 2);
      	}
      	else
***************
*** 389,393 ****
  		String xmlFile = serializer.toXML(stockAnalysis);
      	String filePath;
! 		if (this.getTitle().endsWith(" - " + DEFAULT_TITLE)) 
  		{
  			filePath = FrameHelper.getStockAnalysisPath() + "/" + this.getTitle().split(" - ")[0];
--- 390,394 ----
  		String xmlFile = serializer.toXML(stockAnalysis);
      	String filePath;
! 		if (this.getTitle().endsWith(" - " + messageBundle.getString("DEFAULT_TITLE"))) 
  		{
  			filePath = FrameHelper.getStockAnalysisPath() + "/" + this.getTitle().split(" - ")[0];
***************
*** 408,412 ****
  		write.print(xmlFile);
  		write.close();
! 		this.setTitle(stockAnalysisXML.getName() + " - " + DEFAULT_TITLE);
  	}
  
--- 409,413 ----
  		write.print(xmlFile);
  		write.close();
! 		this.setTitle(stockAnalysisXML.getName() + " - " + messageBundle.getString("DEFAULT_TITLE"));
  	}
  
***************
*** 433,437 ****
          		write.print(xmlFile);
          		write.close();
!         		this.setTitle(stockAnalysisXML.getName() + " - " + DEFAULT_TITLE);
                  break;
          }
--- 434,438 ----
          		write.print(xmlFile);
          		write.close();
!         		this.setTitle(stockAnalysisXML.getName() + " - " + messageBundle.getString("DEFAULT_TITLE"));
                  break;
          }

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

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

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

Modified Files:
	NewStockAnalysis2.java NewStockAnalysis.java 
	NewStockAnalysis3.java 
Log Message:
Atualizando telas que tinha algo hard coded e jogadas para arquivos de properties (mensagens de erro, pastas e packages etc).

Index: NewStockAnalysis2.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NewStockAnalysis2.java	1 Oct 2007 23:16:58 -0000	1.1
--- NewStockAnalysis2.java	3 Oct 2007 20:48:43 -0000	1.2
***************
*** 12,15 ****
--- 12,16 ----
  import java.util.ArrayList;
  import java.util.List;
+ import java.util.ResourceBundle;
  
  import javax.swing.JCheckBox;
***************
*** 27,30 ****
--- 28,32 ----
   */
  public class NewStockAnalysis2 extends javax.swing.JFrame {
+ 	private static final ResourceBundle messageBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Messages");
  
     	private static final long serialVersionUID = 1L;
***************
*** 46,50 ****
          this.setResizable(false);
          this.setLocationByPlatform(true);
!         this.setTitle("New Stock Analysis");
      }
      
--- 48,52 ----
          this.setResizable(false);
          this.setLocationByPlatform(true);
!         this.setTitle(messageBundle.getString("STOCKANALYSIS_TITLE"));
      }
      
***************
*** 138,142 ****
  			selectedCriterion = FrameHelper.getSelectedCriterion(analysisComboBox.getSelectedItem().toString());
  		} catch (Exception e) {
! 			JOptionPane.showMessageDialog(null, analysisComboBox.getSelectedItem().toString() + " doesn't exists in library, choose another one.", "Error", 0);
  		}
      	List<AnalysisCriterion> additionalCriteria = new ArrayList<AnalysisCriterion>();
--- 140,144 ----
  			selectedCriterion = FrameHelper.getSelectedCriterion(analysisComboBox.getSelectedItem().toString());
  		} catch (Exception e) {
! 			JOptionPane.showMessageDialog(null, analysisComboBox.getSelectedItem().toString() + messageBundle.getString("SELECTED_CRITERION"), "Error", 0);
  		}
      	List<AnalysisCriterion> additionalCriteria = new ArrayList<AnalysisCriterion>();
***************
*** 151,155 ****
  						criterion = FrameHelper.getSelectedCriterion(checkBox.getText());
  					} catch (Exception e) {
! 						JOptionPane.showMessageDialog(null, checkBox.getText() + " doesn't exists in library, list may be incomplete.", "Error", 2);
  					}
  					
--- 153,157 ----
  						criterion = FrameHelper.getSelectedCriterion(checkBox.getText());
  					} catch (Exception e) {
! 						JOptionPane.showMessageDialog(null, checkBox.getText() + messageBundle.getString("SELECTED_CRITERIA"), "Error", 2);
  					}
  					
***************
*** 163,167 ****
      	if (selectedCriterion == null)
      	{
!     		JOptionPane.showMessageDialog(null, analysisComboBox.getSelectedItem().toString() + " doesn't exists in library, choose another one.", "Error", 0);
      	}
      	else
--- 165,169 ----
      	if (selectedCriterion == null)
      	{
!     		JOptionPane.showMessageDialog(null, analysisComboBox.getSelectedItem().toString() + messageBundle.getString("SELECTED_CRITERION"), "Error", 0);
      	}
      	else

Index: NewStockAnalysis.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NewStockAnalysis.java	1 Oct 2007 23:16:58 -0000	1.1
--- NewStockAnalysis.java	3 Oct 2007 20:48:43 -0000	1.2
***************
*** 14,17 ****
--- 14,18 ----
  import java.io.OutputStream;
  import java.io.PrintWriter;
+ import java.util.ResourceBundle;
  
  import javax.swing.JFileChooser;
***************
*** 29,33 ****
   */
  public class NewStockAnalysis extends javax.swing.JFrame {
!     
  	private static final long serialVersionUID = -8970828566986978459L;
      private javax.swing.JButton cancelButton;
--- 30,36 ----
   */
  public class NewStockAnalysis extends javax.swing.JFrame {
! 	private static final ResourceBundle messageBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Messages");
! 	private static final ResourceBundle folderBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Folders");
! 	
  	private static final long serialVersionUID = -8970828566986978459L;
      private javax.swing.JButton cancelButton;
***************
*** 59,63 ****
          this.setResizable(false);
          this.setLocationByPlatform(true);
!         this.setTitle("New Stock Analysis");
      }
      
--- 62,66 ----
          this.setResizable(false);
          this.setLocationByPlatform(true);
!         this.setTitle(messageBundle.getString("STOCKANALYSIS_TITLE"));
      }
      
***************
*** 85,91 ****
  
          stockFileChooser.setFileSelectionMode(javax.swing.JFileChooser.FILES_ONLY);
!         stockFileChooser.setCurrentDirectory(new File("Data/Stock"));
          seriesFileChooser.setFileSelectionMode(javax.swing.JFileChooser.FILES_ONLY);
!         seriesFileChooser.setCurrentDirectory(new File("Data/Bovespa"));
          
          stockPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Stock", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Dialog", 0, 14), new java.awt.Color(0, 0, 0)));
--- 88,94 ----
  
          stockFileChooser.setFileSelectionMode(javax.swing.JFileChooser.FILES_ONLY);
!         stockFileChooser.setCurrentDirectory(new File(folderBundle.getString("STOCK_DIR")));
          seriesFileChooser.setFileSelectionMode(javax.swing.JFileChooser.FILES_ONLY);
!         seriesFileChooser.setCurrentDirectory(new File(folderBundle.getString("BOVESPA_DIR")));
          
          stockPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Stock", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Dialog", 0, 14), new java.awt.Color(0, 0, 0)));
***************
*** 104,108 ****
  
          stockButtonGroup.add(loadRadioButton);
!         loadRadioButton.setText(" Load Stock From File");
          loadRadioButton.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
          loadRadioButton.setMargin(new java.awt.Insets(0, 0, 0, 0));
--- 107,111 ----
  
          stockButtonGroup.add(loadRadioButton);
!         loadRadioButton.setText("Load Stock From File");
          loadRadioButton.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
          loadRadioButton.setMargin(new java.awt.Insets(0, 0, 0, 0));
***************
*** 271,275 ****
  	    if (stockAnalysisField.getText().equals(""))
  	    {
! 			JOptionPane.showMessageDialog(null, "Please enter stock analysis name.", "Error", 2);
  	    }
  	    else 
--- 274,278 ----
  	    if (stockAnalysisField.getText().equals(""))
  	    {
! 			JOptionPane.showMessageDialog(null, messageBundle.getString("STOCKANALYSIS_NAME"), "Error", 2);
  	    }
  	    else 
***************
*** 281,285 ****
  	    		if (stockNameField.getText().equals("") || seriesField.getText().equals(""))
  	    		{
! 	    			JOptionPane.showMessageDialog(null, "Please enter stock name and series address.", "Error", 2);
  	    		}
  	    		else
--- 284,288 ----
  	    		if (stockNameField.getText().equals("") || seriesField.getText().equals(""))
  	    		{
! 	    			JOptionPane.showMessageDialog(null, messageBundle.getString("SERIES_FIELDS"), "Error", 2);
  	    		}
  	    		else
***************
*** 288,292 ****
  						stock = new Stock(stockNameField.getText(), seriesField.getText(), FrameHelper.getSelectedLoader(seriesFormatComboBox.getSelectedItem().toString()));
  						String xmlFile = stockSerializer.toXML(stock);
! 		                String filePath = "Data/Stock/" + stockNameField.getText();
  		            	File stockAnalysisXML = new File(filePath + ".xml");
  		        		OutputStream out;
--- 291,295 ----
  						stock = new Stock(stockNameField.getText(), seriesField.getText(), FrameHelper.getSelectedLoader(seriesFormatComboBox.getSelectedItem().toString()));
  						String xmlFile = stockSerializer.toXML(stock);
! 		                String filePath = folderBundle.getString("STOCK_DIR") + stockNameField.getText();
  		            	File stockAnalysisXML = new File(filePath + ".xml");
  		        		OutputStream out;
***************
*** 303,307 ****
  						
  					} catch (Exception e) {
! 						JOptionPane.showMessageDialog(null, "Invalid series file, please select a valid one.", "Error", 0);
  					}
  	    		}
--- 306,310 ----
  						
  					} catch (Exception e) {
! 						JOptionPane.showMessageDialog(null, messageBundle.getString("SERIES_FILE"), "Error", 0);
  					}
  	    		}
***************
*** 311,315 ****
  	    		if (stockField.getText().equals(""))
  	    		{
! 	    			JOptionPane.showMessageDialog(null, "Please enter stock adress.", "Error", 2);
  	    		}
  	    		else
--- 314,318 ----
  	    		if (stockField.getText().equals(""))
  	    		{
! 	    			JOptionPane.showMessageDialog(null, messageBundle.getString("STOCK_ADDRESS"), "Error", 2);
  	    		}
  	    		else
***************
*** 321,325 ****
  		    	        this.dispose();
  					} catch (Exception e) {
! 						JOptionPane.showMessageDialog(null, "Invalid stock file, please select a valid one.", "Error", 0);
  					}
  	    		}
--- 324,328 ----
  		    	        this.dispose();
  					} catch (Exception e) {
! 						JOptionPane.showMessageDialog(null, messageBundle.getString("STOCK_FILE"), "Error", 0);
  					}
  	    		}

Index: NewStockAnalysis3.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/stockAnalysis/NewStockAnalysis3.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NewStockAnalysis3.java	1 Oct 2007 23:16:58 -0000	1.1
--- NewStockAnalysis3.java	3 Oct 2007 20:48:43 -0000	1.2
***************
*** 9,12 ****
--- 9,13 ----
  
  import java.util.List;
+ import java.util.ResourceBundle;
  
  import javax.swing.JFrame;
***************
*** 33,36 ****
--- 34,38 ----
   */
  public class NewStockAnalysis3 extends javax.swing.JFrame {
+ 	private static final ResourceBundle messageBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Messages");
  	
  	private static final long serialVersionUID = 1L;
***************
*** 66,70 ****
          this.setResizable(false);
          this.setLocationByPlatform(true);
!         this.setTitle("New Stock Analysis");
      }
      
--- 68,72 ----
          this.setResizable(false);
          this.setLocationByPlatform(true);
!         this.setTitle(messageBundle.getString("STOCKANALYSIS_TITLE"));
      }
      
***************
*** 260,264 ****
  			startDate = FrameHelper.getDate(startDateField.getText());
  		} catch (Exception e) {
! 			JOptionPane.showMessageDialog(null, "Please enter a valid start date (dd/mm/yyyy).", "Error", 2);
  			return;
  		}
--- 262,266 ----
  			startDate = FrameHelper.getDate(startDateField.getText());
  		} catch (Exception e) {
! 			JOptionPane.showMessageDialog(null, messageBundle.getString("START_DATE"), "Error", 2);
  			return;
  		}
***************
*** 266,270 ****
  		if(yearsField.getText().equals("") || monthsField.getText().equals("") || daysField.getText().equals("") || hoursField.getText().equals("") || minutesField.getText().equals(""))
  		{
! 			JOptionPane.showMessageDialog(null, "Please fill all Slices Period fields (zero if not using it).", "Error", 2);
  			return;
  		}
--- 268,272 ----
  		if(yearsField.getText().equals("") || monthsField.getText().equals("") || daysField.getText().equals("") || hoursField.getText().equals("") || minutesField.getText().equals(""))
  		{
! 			JOptionPane.showMessageDialog(null, messageBundle.getString("PERIOD_FIELDS"), "Error", 2);
  			return;
  		}
***************
*** 278,284 ****
  		{
  			if(year==0 && month==0 && day==0 && hour==0 && minute==0)
! 				JOptionPane.showMessageDialog(null, "One or more Slices Period field must be greater than zero.", "Error", 2);
  			else
! 				JOptionPane.showMessageDialog(null, "All Slices Period field must be equal or greater than zero.", "Error", 2);
  			return;
  		}
--- 280,286 ----
  		{
  			if(year==0 && month==0 && day==0 && hour==0 && minute==0)
! 				JOptionPane.showMessageDialog(null, messageBundle.getString("POSITIVE_PERIOD_FIELDS"), "Error", 2);
  			else
! 				JOptionPane.showMessageDialog(null, messageBundle.getString("NEGATIVE_PERIOD_FIELDS"), "Error", 2);
  			return;
  		}

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

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

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

Added Files:
	Messages.properties Packages.properties Folders.properties 
Log Message:
Atualizando telas que tinha algo hard coded e jogadas para arquivos de properties (mensagens de erro, pastas e packages etc).

--- NEW FILE: Messages.properties ---
DEFAULT_TITLE =TailS : Technical Analysis Library Software
STOCKANALYSIS_TITLE =New Stock Analysis
REPORT_XLS =Please select the report you want to export to XLS.
REPORT_HTML =Please select the report you want to export to HTML.
OPEN_STOCKANALYSIS =Please open or create a new stock analysis to generate a report.
STOCKANALYSIS_NAME =Please enter stock analysis name.
SERIES_FIELDS =Please enter stock name and series address.
SERIES_FILE =Invalid series file, please select a valid one.
STOCK_ADDRESS =Please enter stock adress.
STOCK_FILE =Invalid stock file, please select a valid one.
SELECTED_CRITERION = doesn't exists in library, choose another one.
SELECTED_CRITERIA = doesn't exists in library, list may be incomplete.
START_DATE =Please enter a valid start date (dd/mm/yyyy).
PERIOD_FIELDS =Please fill all Slices Period fields (zero if not using it).
POSITIVE_PERIOD_FIELDS =One or more Slices Period field must be greater than zero.
NEGATIVE_PERIOD_FIELDS =All Slices Period field must be equal or greater than zero.
--- NEW FILE: Folders.properties ---
CRITERIA_DIR =Data/Criteria
LOADER_DIR =Data/Loaders
STOCKANALYSIS_DIR =Data/StockAnalysis
STOCK_DIR =Data/Stock
BOVESPA_DIR =Data/Bovespa
--- NEW FILE: Packages.properties ---
CRITERIA_PACKAGE =net.sf.tail.analysis.criteria.
LOADER_PACKAGE =net.sf.tail.io.reader.

[Tail-cvs] TailS/lib jeditsyntaxpackage.jar,1.1

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

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

Added Files:
	jeditsyntaxpackage.jar 
Log Message:
criado syntax highlighting

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

[Tail-cvs] TailS/src/java/net/sf/tails/swing/frame/report NewReportFrame.java, 1.9

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

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

Modified Files:
	NewReportFrame.java 
Log Message:
criado syntax highlighting

Index: NewReportFrame.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/report/NewReportFrame.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** NewReportFrame.java	3 Oct 2007 19:12:07 -0000	1.8
--- NewReportFrame.java	3 Oct 2007 20:20:34 -0000	1.9
***************
*** 10,24 ****
  import javax.swing.JOptionPane;
  
- import org.gjt.sp.jedit.syntax.JEditTextArea;
- 
- import dsl.TailSTokenMarker;
- 
  import net.sf.tail.Strategy;
  import net.sf.tail.analysis.StockAnalysis;
  import net.sf.tail.dsl.TailDSL;
  import net.sf.tail.dsl.ruby.RubyDSL;
  import net.sf.tails.swing.frame.Index;
  import net.sf.tails.swing.helper.FrameHelper;
  
  /**
   *
--- 10,23 ----
  import javax.swing.JOptionPane;
  
  import net.sf.tail.Strategy;
  import net.sf.tail.analysis.StockAnalysis;
  import net.sf.tail.dsl.TailDSL;
  import net.sf.tail.dsl.ruby.RubyDSL;
+ import net.sf.tails.dsl.TailSTokenMarker;
  import net.sf.tails.swing.frame.Index;
  import net.sf.tails.swing.helper.FrameHelper;
  
+ import org.gjt.sp.jedit.syntax.JEditTextArea;
+ 
  /**
   *

[Tail-cvs] TailS .classpath,1.10

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

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

Modified Files:
	.classpath 
Log Message:
criado syntax highlighting

Index: .classpath
===================================================================
RCS file: /cvsroot/tail/TailS/.classpath,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** .classpath	3 Oct 2007 19:12:07 -0000	1.9
--- .classpath	3 Oct 2007 20:20:34 -0000	1.10
***************
*** 9,15 ****
  	<classpathentry kind="lib" path="lib/joda-time-1.4-src-ide.zip"/>
  	<classpathentry kind="lib" path="lib/poi-3.0.1-FINAL-20070705.jar"/>
  	<classpathentry kind="src" path="dsl"/>
  	<classpathentry combineaccessrules="false" kind="src" path="/Tail"/>
- 	<classpathentry combineaccessrules="false" kind="src" path="/syntax"/>
  	<classpathentry kind="output" path="bin"/>
  </classpath>
--- 9,15 ----
  	<classpathentry kind="lib" path="lib/joda-time-1.4-src-ide.zip"/>
  	<classpathentry kind="lib" path="lib/poi-3.0.1-FINAL-20070705.jar"/>
+ 	<classpathentry kind="lib" path="lib/jeditsyntaxpackage.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/dsl TailSTokenMarker.java, 1.2

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

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

Modified Files:
	TailSTokenMarker.java 
Log Message:
criado syntax highlighting

Index: TailSTokenMarker.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/dsl/TailSTokenMarker.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TailSTokenMarker.java	3 Oct 2007 19:12:06 -0000	1.1
--- TailSTokenMarker.java	3 Oct 2007 20:20:34 -0000	1.2
***************
*** 14,24 ****
  	private static KeywordMap TailSKeywords;
  	
! 	public TailSTokenMarker()
! 	{
! 		super(false,getKeywords());
  		ResourceBundle bundle = ResourceBundle.getBundle("net.sf.tails.i18n.DSL_IDE");
  		rubyKeyWords = bundle.getString("RUBY_KEYWORDS").split(" ");
  		tailKeyWords = bundle.getString("TAIL_KEYWORDS").split(" ");
  	}
  
  	public static KeywordMap getKeywords()
--- 14,27 ----
  	private static KeywordMap TailSKeywords;
  	
! 	static{
  		ResourceBundle bundle = ResourceBundle.getBundle("net.sf.tails.i18n.DSL_IDE");
  		rubyKeyWords = bundle.getString("RUBY_KEYWORDS").split(" ");
  		tailKeyWords = bundle.getString("TAIL_KEYWORDS").split(" ");
  	}
+ 	
+ 	public TailSTokenMarker()
+ 	{
+ 		super(false,getKeywords());
+ 	}
  
  	public static KeywordMap getKeywords()
***************
*** 31,35 ****
  			}
  			for (String key : tailKeyWords) {
! 				TailSKeywords.add(key, Token.KEYWORD2);
  			}
  		}
--- 34,38 ----
  			}
  			for (String key : tailKeyWords) {
! 				TailSKeywords.add(key, Token.LITERAL1);
  			}
  		}

[Tail-cvs] Tail/src/java/net/sf/tail/report/xls ReportXlsGenerator.java, 1.8 CompleteXlsGenerator.java, 1.13 TimeSeriesXlsGenerator.java, 1.2 SliceXlsGenerator.java, 1.8

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

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

Modified Files:
	ReportXlsGenerator.java CompleteXlsGenerator.java 
	TimeSeriesXlsGenerator.java SliceXlsGenerator.java 
Log Message:
Refatoração nas classes de geração de report.

Index: CompleteXlsGenerator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/CompleteXlsGenerator.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CompleteXlsGenerator.java	3 Oct 2007 17:47:00 -0000	1.12
--- CompleteXlsGenerator.java	3 Oct 2007 19:59:55 -0000	1.13
***************
*** 35,39 ****
  		criteria2.add(0,report.getApplyedCriterion());
  		
! 		seriesXls.generate(report.getSlicer().getSeries());
  		reportXls.generate(report, criteria, period);
  		slicerXls.generate(report, criteria2, period);
--- 35,39 ----
  		criteria2.add(0,report.getApplyedCriterion());
  		
! 		seriesXls.generate(report);
  		reportXls.generate(report, criteria, period);
  		slicerXls.generate(report, criteria2, period);

Index: TimeSeriesXlsGenerator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/TimeSeriesXlsGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TimeSeriesXlsGenerator.java	25 Sep 2007 00:04:22 -0000	1.1
--- TimeSeriesXlsGenerator.java	3 Oct 2007 19:59:55 -0000	1.2
***************
*** 3,8 ****
--- 3,10 ----
  import java.io.IOException;
  
+ import net.sf.tail.ConstrainedTimeSeries;
  import net.sf.tail.Tick;
  import net.sf.tail.TimeSeries;
+ import net.sf.tail.report.Report;
  
  import org.apache.poi.hssf.usermodel.HSSFCell;
***************
*** 28,34 ****
  	}
  
! 	public HSSFSheet generate(TimeSeries series) throws IOException {
! 		int row = INDEX_FIRST_ROW;
! 
  		HSSFCellStyle style = stylist.createHeaderCellStyle();
  		row = generateHeader(row, style);
--- 30,39 ----
  	}
  
! 	public HSSFSheet generate(Report report) throws IOException {
! 		int row = INDEX_FIRST_ROW;	
! 		
! 		TimeSeries series = new ConstrainedTimeSeries(report.getSlicer().getSeries(), 
! 				report.getDecisions().get(0).getSeries().getBegin(), report.getSlicer().getSeries().getEnd() - 1);
! 		
  		HSSFCellStyle style = stylist.createHeaderCellStyle();
  		row = generateHeader(row, style);
***************
*** 61,65 ****
  	private void generateInternalRow(int firtRow, TimeSeries series, HSSFCellStyle style) {
  		int i;
! 		for (i = 0; i < series.getSize() - 1; i++) {
  			Tick tick = series.getTick(i);
  			int indexcolumn = INDEX_FIRST_COLUMN;
--- 66,70 ----
  	private void generateInternalRow(int firtRow, TimeSeries series, HSSFCellStyle style) {
  		int i;
! 		for (i = series.getBegin(); i < series.getEnd(); i++) {
  			Tick tick = series.getTick(i);
  			int indexcolumn = INDEX_FIRST_COLUMN;

Index: SliceXlsGenerator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/SliceXlsGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SliceXlsGenerator.java	3 Oct 2007 17:47:00 -0000	1.7
--- SliceXlsGenerator.java	3 Oct 2007 19:59:55 -0000	1.8
***************
*** 71,75 ****
  		stylist.drawImage(reportPNG, sheet, 1, 7);
  
! 		stylist.rearrangeSheet(sheet, 10);
  
  		sheets.add(sheet);
--- 71,75 ----
  		stylist.drawImage(reportPNG, sheet, 1, 7);
  
! 		stylist.rearrangeSheet(sheet, criteria.size() + 6);
  
  		sheets.add(sheet);

Index: ReportXlsGenerator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/xls/ReportXlsGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ReportXlsGenerator.java	1 Oct 2007 23:54:36 -0000	1.7
--- ReportXlsGenerator.java	3 Oct 2007 19:59:55 -0000	1.8
***************
*** 71,75 ****
  		stylist.drawImage(reportPNG, sheet, 1, 5);
  
! 		stylist.rearrangeSheet(sheet, 10);
  
  		sheets.add(sheet);
--- 71,75 ----
  		stylist.drawImage(reportPNG, sheet, 1, 5);
  
! 		stylist.rearrangeSheet(sheet, criteria.size() + 5);
  
  		sheets.add(sheet);
***************
*** 87,92 ****
  		createCell(rowHeader, "Final Date", (short) columnIndex++, style);
  		createCell(rowHeader, "Strategy", (short) columnIndex++, style);
- 		createCell(rowHeader, report.getApplyedCriterion().getClass().getSimpleName(),
- 				(short) columnIndex++, style);
  		for (AnalysisCriterion criterium : criteria) {
  			createCell(rowHeader, criterium.getClass().getSimpleName(), (short) columnIndex++, style);
--- 87,90 ----
***************
*** 108,112 ****
  				.getDateName(), (short) indexcolumn++, style);
  		createCell(rowFirst, " - ", (short) indexcolumn++, style);
- 		createCell(rowFirst, " - ", (short) indexcolumn++, style);
  
  		for (int i=0; i < criteria.size(); i++)
--- 106,109 ----
***************
*** 133,138 ****
  					(short) indexcolumn++, style);
  			createCell(rowDecision, decision.getStrategy().getName(), (short) indexcolumn++, style);
- 			calculate = report.getApplyedCriterion().calculate(decision.getSeries(), decision.getTrades());
- 			createCell(rowDecision, calculate, (short) indexcolumn++, style);
  			for (AnalysisCriterion criterium : criteria) {
  				calculate = criterium.calculate(decision.getSeries(), decision.getTrades());
--- 130,133 ----
***************
*** 157,162 ****
  				.getDateName(), (short) indexcolumn++, style);
  		createCell(rowLast, " - ", (short) indexcolumn++, style);
- 		calculate = report.getApplyedCriterion().summarize(report.getSlicer().getSeries(), report.getDecisions());
- 		createCell(rowLast, calculate, (short) indexcolumn++, style);
  		for (AnalysisCriterion criterium : criteria) {
  			calculate = criterium.summarize(report.getSlicer().getSeries(), report.getDecisions());
--- 152,155 ----

[Tail-cvs] Tail/src/test/net/sf/tail/report/xls CompleteXlsGeneratorExecutor.java, 1.5

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

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

Modified Files:
	CompleteXlsGeneratorExecutor.java 
Log Message:
Refatoração nas classes de geração de report.

Index: CompleteXlsGeneratorExecutor.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/xls/CompleteXlsGeneratorExecutor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CompleteXlsGeneratorExecutor.java	3 Oct 2007 17:47:00 -0000	1.4
--- CompleteXlsGeneratorExecutor.java	3 Oct 2007 19:59:55 -0000	1.5
***************
*** 22,29 ****
  import net.sf.tail.analysis.criteria.RewardRiskRatioCriterion;
  import net.sf.tail.analysis.criteria.TotalProfitCriterion;
  import net.sf.tail.analysis.evaluator.BestStrategyEvaluator;
  import net.sf.tail.analysis.walk.WalkForward;
  import net.sf.tail.indicator.simple.ClosePriceIndicator;
! import net.sf.tail.indicator.tracker.EMAIndicator;
  import net.sf.tail.io.reader.CedroTimeSeriesLoader;
  import net.sf.tail.report.Report;
--- 22,31 ----
  import net.sf.tail.analysis.criteria.RewardRiskRatioCriterion;
  import net.sf.tail.analysis.criteria.TotalProfitCriterion;
+ import net.sf.tail.analysis.criteria.VersusBuyAndHoldCriterion;
  import net.sf.tail.analysis.evaluator.BestStrategyEvaluator;
  import net.sf.tail.analysis.walk.WalkForward;
  import net.sf.tail.indicator.simple.ClosePriceIndicator;
! import net.sf.tail.indicator.tracker.ParabolicSarIndicator;
! import net.sf.tail.indicator.tracker.SMAIndicator;
  import net.sf.tail.io.reader.CedroTimeSeriesLoader;
  import net.sf.tail.report.Report;
***************
*** 31,35 ****
  import net.sf.tail.series.SlicerByTimePeriod;
  import net.sf.tail.strategy.IndicatorCrossedIndicatorStrategy;
- import net.sf.tail.strategy.MinValueStopperStrategy;
  
  import org.apache.poi.hssf.usermodel.HSSFWorkbook;
--- 33,36 ----
***************
*** 45,49 ****
  		
  		try {
! 			timeSeries = ctsl.load(new FileInputStream("BaseBovespa/diario/petr4Dia2000.csv"), "Ambev (ambv4)");
  		} catch (FileNotFoundException e) {
  			e.printStackTrace();
--- 46,50 ----
  		
  		try {
! 			timeSeries = ctsl.load(new FileInputStream("BaseBovespa/diario/petr4Dia.csv"), "Petrobras (petr4)");
  		} catch (FileNotFoundException e) {
  			e.printStackTrace();
***************
*** 56,76 ****
  		
  		
! 		for (int i = 4; i < 60; i++) {
! 			Indicator<Double> tracker = new EMAIndicator(close, i);
! 			Strategy strategy =   new MinValueStopperStrategy(close, new IndicatorCrossedIndicatorStrategy(tracker, close), 5);
! 			strategies.add(strategy);
! 		}					
! 		
! //		for (int i = 4; i < 20; i++) {
! //			Indicator<Double> tracker = new SMAIndicator(close, i);
! //			Strategy strategy = new IndicatorOverIndicatorStrategy(tracker, close);
  //			strategies.add(strategy);
  //		}
! //		Indicator<Double> tracker = new ParabolicSarIndicator(timeSeries);
! //		Strategy strategy = new IndicatorCrossedIndicatorStrategy(tracker, close);
! //		strategies.add(strategy);
  
! 		Report r = w.walk(strategies, new SlicerByTimePeriod(timeSeries, new Period().withMonths(6),new DateTime().withDate(2000, 1, 1),
! 				SlicerType.REGULAR), new TotalProfitCriterion());
  		
  		CompleteXlsGenerator xls = new CompleteXlsGenerator();
--- 57,80 ----
  		
  		
! //		for (int i = 4; i < 60; i++) {
! //			Indicator<Double> tracker = new EMAIndicator(close, i);
! //			Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker);
  //			strategies.add(strategy);
  //		}
! 		
! 		for (int i = 4; i < 20; i++) {
! 			Indicator<Double> tracker = new SMAIndicator(close, i);
! 			Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker);
! 			strategies.add(strategy);
! 		}
! 		
! 		Indicator<Double> tracker = new ParabolicSarIndicator(timeSeries);
! 		Strategy strategy = new IndicatorCrossedIndicatorStrategy(close, tracker);
! 		strategies.add(strategy);
! 		
! 		
  
! 		Report r = w.walk(strategies, new SlicerByTimePeriod(timeSeries, new Period().withMonths(10), new DateTime(2000, 1, 1, 0, 0, 0, 0),
! 				SlicerType.MEMORIZED), new TotalProfitCriterion());
  		
  		CompleteXlsGenerator xls = new CompleteXlsGenerator();
***************
*** 82,87 ****
  		criteria.add(new AverageProfitCriterion());
  		criteria.add(new NumberOfTicksCriterion());
  		
! 		workbook = xls.generate(r, criteria, new Period().withMonths(6));
  		
  		FileOutputStream fileOut = new FileOutputStream("report.xls");
--- 86,92 ----
  		criteria.add(new AverageProfitCriterion());
  		criteria.add(new NumberOfTicksCriterion());
+ 		criteria.add(new VersusBuyAndHoldCriterion(new TotalProfitCriterion()));
  		
! 		workbook = xls.generate(r, criteria, new Period().withMonths(10));
  		
  		FileOutputStream fileOut = new FileOutputStream("report.xls");

[Tail-cvs] Tail/src/java/net/sf/tail/report/html CompleteHtmlGenerator.java, 1.6

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

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

Modified Files:
	CompleteHtmlGenerator.java 
Log Message:
Refatoração nas classes de geração de report.

Index: CompleteHtmlGenerator.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/html/CompleteHtmlGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CompleteHtmlGenerator.java	1 Oct 2007 22:45:39 -0000	1.5
--- CompleteHtmlGenerator.java	3 Oct 2007 19:59:55 -0000	1.6
***************
*** 58,66 ****
  		StringBuffer htmlCode;
  		ReportImage image = new ReportImage();
! 
  		for (Decision decision : report.getDecisions()) {
  			img = image.generateImage(decision);
  
! 			htmlCode = reportGenerator.generate(decision, criteria, img.getAbsolutePath());
  			createHTML(decision.getFileName(), htmlCode);
  			urls.add(decision.getFileName() + ".html");
--- 58,68 ----
  		StringBuffer htmlCode;
  		ReportImage image = new ReportImage();
! 		List<AnalysisCriterion> criteriaApplyed = criteria;
! 		criteriaApplyed.add(0,report.getApplyedCriterion());
! 		
  		for (Decision decision : report.getDecisions()) {
  			img = image.generateImage(decision);
  
! 			htmlCode = reportGenerator.generate(decision, criteriaApplyed, img.getAbsolutePath());
  			createHTML(decision.getFileName(), htmlCode);
  			urls.add(decision.getFileName() + ".html");