tail-cvs

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

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

Modified Files:
	PartialMemorizedSlicer.java SerializableTimeSeries.java 
	DefaultTimeSeries.java 
Log Message:
Preparando para a tela INFO do Report

Index: PartialMemorizedSlicer.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/series/PartialMemorizedSlicer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PartialMemorizedSlicer.java	8 Oct 2007 19:15:28 -0000	1.5
--- PartialMemorizedSlicer.java	17 Oct 2007 23:23:35 -0000	1.6
***************
*** 179,185 ****
  	}
  
! 	public DateTime getPeriodBegin() {
  		return periodBegin;
  	}
  
  }
--- 179,197 ----
  	}
  
! 	public DateTime getDateBegin() {
  		return periodBegin;
  	}
  
+ 	public int getNumberOfSlices() {
+ 		return splittedSeries.size();
+ 	}
+ 
+ 	public double getAverageTicksPerSlice() {
+ 		double sum = 0;
+ 		for (TimeSeries series : splittedSeries) {
+ 			sum += series.getSize();
+ 		}
+ 		return sum / this.getNumberOfSlices();
+ 	}
+ 
  }

Index: DefaultTimeSeries.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/series/DefaultTimeSeries.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DefaultTimeSeries.java	17 Oct 2007 16:41:55 -0000	1.6
--- DefaultTimeSeries.java	17 Oct 2007 23:23:35 -0000	1.7
***************
*** 6,9 ****
--- 6,11 ----
  import net.sf.tail.TimeSeries;
  
+ import org.joda.time.Period;
+ 
  /**
   * Implementação default da interface {@link TimeSeries}.
***************
*** 12,16 ****
   * 
   */
! public class DefaultTimeSeries implements TimeSeries{
  	transient private final List<Tick> ticks;
  
--- 14,18 ----
   * 
   */
! public class DefaultTimeSeries implements TimeSeries {
  	transient private final List<Tick> ticks;
  
***************
*** 46,50 ****
  	}
  
! 	public String getPeriod() {
  		return ticks.get(0).getDate().toString("hh:mm dd/MM/yyyy - ")
  				+ ticks.get(this.getEnd()).getDate().toString("hh:mm dd/MM/yyyy");
--- 48,52 ----
  	}
  
! 	public String getPeriodName() {
  		return ticks.get(0).getDate().toString("hh:mm dd/MM/yyyy - ")
  				+ ticks.get(this.getEnd()).getDate().toString("hh:mm dd/MM/yyyy");
***************
*** 81,85 ****
  		return true;
  	}
! 	
! 	
  }
--- 83,92 ----
  		return true;
  	}
! 
! 	public Period getPeriod() {
! 		return new Period(Math.min(ticks.get(1).getDate().getMillis() - ticks.get(0).getDate().getMillis(), ticks
! 				.get(2).getDate().getMillis()
! 				- ticks.get(1).getDate().getMillis()));
! 	}
! 
  }

Index: SerializableTimeSeries.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/series/SerializableTimeSeries.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SerializableTimeSeries.java	17 Oct 2007 16:51:43 -0000	1.1
--- SerializableTimeSeries.java	17 Oct 2007 23:23:35 -0000	1.2
***************
*** 5,8 ****
--- 5,10 ----
  import java.io.IOException;
  
+ import org.joda.time.Period;
+ 
  import net.sf.tail.Tick;
  import net.sf.tail.TimeSeries;
***************
*** 90,95 ****
  	}
  
! 	public String getPeriod() {
! 		return getSeries().getPeriod();
  	}
  
--- 92,97 ----
  	}
  
! 	public String getPeriodName() {
! 		return getSeries().getPeriodName();
  	}
  
***************
*** 101,103 ****
--- 103,110 ----
  		return getSeries().getTick(i);
  	}
+ 
+ 	public Period getPeriod() {
+ 		return new Period(Math.min(series.getTick(series.getBegin() + 1).getDate().getMillis() - series.getTick(series.getBegin()).getDate().getMillis(), 
+ 				series.getTick(series.getBegin() + 2).getDate().getMillis() - series.getTick(series.getBegin() + 1).getDate().getMillis()));
+ 	}
  }