[Tail-cvs] Tail/src/java/net/sf/tail/report Report.java, 1.7 ReportSerializer.java, NONE

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

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

Modified Files:
	Report.java 
Removed Files:
	ReportSerializer.java 
Log Message:
Refatoração de packages e criação de novas classes para serializar em xml

--- ReportSerializer.java DELETED ---

Index: Report.java
===================================================================
RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/report/Report.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Report.java	20 Aug 2007 18:03:57 -0000	1.6
--- Report.java	20 Aug 2007 21:31:20 -0000	1.7
***************
*** 1,5 ****
--- 1,7 ----
  package net.sf.tail.report;
  
+ import java.util.HashMap;
  import java.util.List;
+ import java.util.Map;
  
  import net.sf.tail.AnalysisCriterion;
***************
*** 13,22 ****
  	private TimeSeriesSlicer slicer;
  
! 	private AnalysisCriterion criterion;
  
  	public Report(AnalysisCriterion criterion, TimeSeriesSlicer slicer, List<Decision> decisions) {
! 		this.criterion = criterion;
  		this.decisions = decisions;
  		this.slicer = slicer;
  	}
  
--- 15,35 ----
  	private TimeSeriesSlicer slicer;
  
! 	private AnalysisCriterion applyedCriterion;
  
+ 	private Number criterionValue;
+ 
+ 	private Map<Number,AnalysisCriterion> additionalCriteria;
+ 	
  	public Report(AnalysisCriterion criterion, TimeSeriesSlicer slicer, List<Decision> decisions) {
! 		this.applyedCriterion = criterion;
  		this.decisions = decisions;
  		this.slicer = slicer;
+ 		additionalCriteria = new HashMap<Number, AnalysisCriterion>();
+ 	}
+ 	
+ 	public Number addSummarizedCriteria(AnalysisCriterion criterion){
+ 		Number result = criterion.summarize(slicer.getSeries(), decisions);
+ 		additionalCriteria.put(result, criterion);
+ 		return result;
  	}
  
***************
*** 29,35 ****
  	}
  
! 	public AnalysisCriterion getCriterion() {
! 		return criterion;
  	}
  
  }
--- 42,55 ----
  	}
  
! 	public AnalysisCriterion getApplyedCriterion() {
! 		return applyedCriterion;
  	}
  
+ 	public Number getCriterionValue() {
+ 		return criterionValue;
+ 	}
+ 
+ 	public Map<Number,AnalysisCriterion> getAdditionalCriteria() {
+ 		return additionalCriteria;
+ 	}
  }