tail-cvs

[Thies <tg...@us...>]

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

Modified Files:
	SlicerByTimePeriod.java 
Log Message:
gerando o memorizedSlicer através de enum

Index: SlicerByTimePeriod.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/analysis/SlicerByTimePeriod.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SlicerByTimePeriod.java	9 Aug 2007 15:21:25 -0000	1.4
--- SlicerByTimePeriod.java	15 Aug 2007 22:07:52 -0000	1.5
***************
*** 22,40 ****
  
  	private DateTime periodBegin;
! 
  	private static Logger LOG = Logger.getLogger(SlicerByTimePeriod.class);
! 
! 	public SlicerByTimePeriod(TimeSeries series, Period period, DateTime begin) {
  		splittedSeries = new ArrayList<TimeSeries>();
  		this.series = series;
  		this.period = period;
  		this.periodBegin = begin;
  		split();
  	}
  
! 	public SlicerByTimePeriod(TimeSeries series, Period period) {
! 		this(series, period, series.getTick(0).getDate());
  	}
  
  	private void split() {
  		LOG.debug(String.format("Spliting %s  ", series));
--- 22,52 ----
  
  	private DateTime periodBegin;
! 	
  	private static Logger LOG = Logger.getLogger(SlicerByTimePeriod.class);
! 	
! 	private SlicerType slicerType;
! 	
! 	
! 	
! 	public SlicerByTimePeriod(TimeSeries series, Period period, DateTime begin, SlicerType slicerType) {
  		splittedSeries = new ArrayList<TimeSeries>();
  		this.series = series;
  		this.period = period;
  		this.periodBegin = begin;
+ 		this.slicerType = slicerType;
  		split();
  	}
  
! 	public SlicerByTimePeriod(TimeSeries series, Period period, SlicerType slicerType) {
! 		this(series, period, series.getTick(0).getDate(), slicerType);
  	}
  
+ 	public TimeSeriesSlicer applyForType(SlicerType type){
+ 		if (type == this.slicerType) {
+ 			return this;
+ 		}
+ 		return new SlicerByTimePeriod(this.series,this.period,this.periodBegin ,type);
+ 	}
+ 	
  	private void split() {
  		LOG.debug(String.format("Spliting %s  ", series));
***************
*** 44,48 ****
  
  		Interval interval = new Interval(begin, end);
- 		int sliceBeginIndex = 0;
  		int index = 0;
  
--- 56,59 ----
***************
*** 50,54 ****
  			index++;
  
! 		sliceBeginIndex = index;
  
  		while (index <= series.getEnd()) {
--- 61,65 ----
  			index++;
  
! 		int sliceBeginIndex = index;
  
  		while (index <= series.getEnd()) {
***************
*** 61,66 ****
  				LOG.debug(String.format("Interval %s before  %s ", interval, series.getTick(index).getDate()));
  
! 				sliceBeginIndex = index;
! 
  				begin = end;
  				end = begin.plus(period);
--- 72,78 ----
  				LOG.debug(String.format("Interval %s before  %s ", interval, series.getTick(index).getDate()));
  
! 				if(slicerType == SlicerType.REGULAR)
! 					sliceBeginIndex = index;
! 								
  				begin = end;
  				end = begin.plus(period);
***************
*** 123,125 ****
--- 135,145 ----
  		return sPeriod.substring(0,sPeriod.length()-2);
  	}
+ 
+ 	public String getPeriod() {
+ 		return this.periodBegin.toString("hh:mm dd/MM/yyyy - ") + series.getTick(series.getEnd()).getDate().toString("hh:mm dd/MM/yyyy");
+ 	}
+ 
+ 	public SlicerType getSlicerType() {
+ 		return this.slicerType;
+ 	}
  }