dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1107
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-11-24 14:53:49 +0100
message:
  Renamed class.
renamed:
  dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/outlieranalysis/AbstractStdDevOutlierAnalysisService.java => dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/outlieranalysis/AbstractOutlierAnalysisService.java
modified:
  dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/outlieranalysis/MinMaxOutlierAnalysisService.java
  dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/outlieranalysis/StdDevOutlierAnalysisService.java
  dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/outlieranalysis/AbstractOutlierAnalysisService.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.

=== renamed file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/outlieranalysis/AbstractStdDevOutlierAnalysisService.java' => 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/outlieranalysis/AbstractOutlierAnalysisService.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/outlieranalysis/AbstractStdDevOutlierAnalysisService.java	2009-07-25 11:08:28 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/outlieranalysis/AbstractOutlierAnalysisService.java	2009-11-24 13:53:49 +0000
@@ -40,19 +40,19 @@
  * @author Dag Haavi Finstad
  * @version $Id: AbstractStdDevOutlierAnalysisService.java 1020 2009-06-05 01:30:07Z daghf $
  */
-public abstract class AbstractStdDevOutlierAnalysisService
+public abstract class AbstractOutlierAnalysisService
     implements OutlierAnalysisService
 {
     public final Collection<OutlierValue> findOutliers( Collection<? extends OrganisationUnit> organisationUnits,
         Collection<DataElement> dataElements, Collection<Period> periods, Double stdDevFactor )
     {
-        final Queue<OrganisationUnit> orgUnitQueue = new LinkedList<OrganisationUnit>( organisationUnits );
+        final Queue<OrganisationUnit> organisationUnitQueue = new LinkedList<OrganisationUnit>( organisationUnits );
         final Collection<OutlierValue> outlierCollection = new ArrayList<OutlierValue>();
         
-        while ( !orgUnitQueue.isEmpty() )
+        while ( !organisationUnitQueue.isEmpty() )
         {
-            final OrganisationUnit organisationUnit = orgUnitQueue.remove();
-            orgUnitQueue.addAll( organisationUnit.getChildren() );
+            final OrganisationUnit organisationUnit = organisationUnitQueue.remove();
+            organisationUnitQueue.addAll( organisationUnit.getChildren() );
             
             for ( DataElement dataElement : dataElements )
             {

=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/outlieranalysis/MinMaxOutlierAnalysisService.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/outlieranalysis/MinMaxOutlierAnalysisService.java	2009-11-07 14:09:00 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/outlieranalysis/MinMaxOutlierAnalysisService.java	2009-11-24 13:53:49 +0000
@@ -45,7 +45,7 @@
  * @version $Id: DefaultMinMaxOutlierAnalysisService.java 1047 2009-06-10 11:01:04Z daghf $
  */
 public class MinMaxOutlierAnalysisService
-    extends AbstractStdDevOutlierAnalysisService
+    extends AbstractOutlierAnalysisService
 {
     // -------------------------------------------------------------------------
     // Dependencies

=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/outlieranalysis/StdDevOutlierAnalysisService.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/outlieranalysis/StdDevOutlierAnalysisService.java	2009-11-07 14:09:00 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/outlieranalysis/StdDevOutlierAnalysisService.java	2009-11-24 13:53:49 +0000
@@ -45,7 +45,7 @@
  * @version $Id: DefaultStdDevOutlierAnalysisService.java 1020 2009-06-05 01:30:07Z daghf $
  */
 public class StdDevOutlierAnalysisService
-    extends AbstractStdDevOutlierAnalysisService
+    extends AbstractOutlierAnalysisService
 {
     // -------------------------------------------------------------------------
     // Dependencies
@@ -84,9 +84,10 @@
         }
 
         double mean = statistics.getMean();
-        double standardDeviation = statistics.getStandardDeviation();
-        double lowerBound = mean - stdDevFactor * standardDeviation;
-        double upperBound = mean + stdDevFactor * standardDeviation;
+        double deviation = statistics.getStandardDeviation() * stdDevFactor;
+        
+        double lowerBound = mean - deviation;
+        double upperBound = mean + deviation;
 
         for ( Period period : periods )
         {