Changeset 3556

Timestamp:

Jul 16, 2007, 8:43:56 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #648 and #650

Location:

trunk/src/core/net/sf/basedb/core

Files:

• ExtraValueType.java (modified) (3 diffs)
• Formula.java (modified) (4 diffs)
• data/ExtraValueTypeData.java (modified) (1 diff)
• data/FormulaData.java (modified) (1 diff)
• query/Aggregations.java (modified) (2 diffs)
• query/GeometricMeanExpression.java (modified) (1 diff)

trunk/src/core/net/sf/basedb/core/ExtraValueType.java

@@ -85 +85 @@
     ev.setExternalId(externalId);
     ev.setValueType(valueType);
-    ev.setAverageMethod(AverageMethod.ARITHMETIC_MEAN);
+    ev.setAverageMethod(valueType.isNumerical() ? AverageMethod.ARITHMETIC_MEAN : AverageMethod.NONE);
     return ev;
   }
@@ -319 +319 @@
     Get the average method for this extra value type.
     @return A {@link AverageMethod} object
+    @since 2.4
    */
   public Formula.AverageMethod getAverageMethod()
@@ -330 +331 @@
       write permission
     @throws InvalidDataException If the averageMethod is null
+    @since 2.4
   */
   public void setAverageMethod(Formula.AverageMethod averageMethod)

trunk/src/core/net/sf/basedb/core/Formula.java

@@ -181 +181 @@
     Get the average method for this formula.
     @return A {@link AverageMethod} object
-   */
+    @since 2.4
+  */
   public Formula.AverageMethod getAverageMethod()
   {
@@ -192 +193 @@
       write permission
     @throws InvalidDataException If the averageMethod is null
+    @since 2.4
   */
   public void setAverageMethod(Formula.AverageMethod averageMethod)
@@ -370 +372 @@
     The average method used for the values of this formula. The average
     is only useful with a {@link Type#COLUMN_EXPRESSION}.
-   */
+    @version 2.4
+  */
   public enum AverageMethod
   {
-    NONE(0, "None"),
-    GEOMETRIC_MEAN(1, "Geometric mean"),
-    ARITHMETIC_MEAN(2, "Arithmetic mean"),
-    MIN(3, "Min"), 
-    MAX(4, "Max");
+    NONE(0, "None")
+    {
+      public Expression getAverageExpression(Expression e)
+      {
+        return null;
+      }
+    },
+    GEOMETRIC_MEAN(1, "Geometric mean")
+    {
+      public Expression getAverageExpression(Expression e)
+      {
+        return Aggregations.geometricMean(e);
+      }     
+    },
+    ARITHMETIC_MEAN(2, "Arithmetic mean")
+    {
+      public Expression getAverageExpression(Expression e)
+      {
+        return Aggregations.mean(e);
+      }
+      
+    },
+    MIN(3, "Min")
+    {
+      public Expression getAverageExpression(Expression e)
+      {
+        return Aggregations.min(e);
+      }
+       
+    },
+    MAX(4, "Max")
+    {
+      public Expression getAverageExpression(Expression e)
+      {
+        return Aggregations.max(e);
+      }
+      
+    };
     
     /**
@@ -415 +451 @@
     }
     
-    public Expression getAverageExpression(Expression e)
-    {
-      Expression avg;
-      switch (this)
-      {
-        case GEOMETRIC_MEAN :
-          avg = Aggregations.geometricMean(e);
-          break;
-        case ARITHMETIC_MEAN :
-          avg = Aggregations.mean(e);
-          break;
-        case MIN :
-          avg = Aggregations.min(e);
-          break;
-        case MAX:
-          avg = Aggregations.max(e);
-          break;
-        case NONE:
-        default:
-          avg = Expressions.string("");
-          break;
-      }
-
-      return avg;
-    }
-    
-    /**
-     * Get the integer value that is used when storing a
-     * <code>Formula.AverageMethod</code> in the database.
-     * 
-     * @return The integer value of this type
-     */
+    /**
+      Given an expression, create an expression that takes the correct 
+      average of it.
+      @param e The expression, null is not allowed
+      @return The average expression, or null if it is not possible
+        to create an average expression
+    */
+    public abstract Expression getAverageExpression(Expression e);
+    
+    /**
+      Get the integer value that is used when storing a
+      <code>Formula.AverageMethod</code> in the database.
+      @return The integer value of this type
+    */
     public int getValue()
     {

trunk/src/core/net/sf/basedb/core/data/ExtraValueTypeData.java

@@ -134 +134 @@
     The average method for thid formula: 
     <ul>
-    <li>0 = none, {@link net.sf.basedb.core.Formula.AverageMethod#NONE}; no average is defined for this formula
-    <li>1 = geometric mean, {@link net.sf.basedb.core.Formula.AverageMethod#GEOMETRIC_MEAN}; this formula uses geometric mean
-    <li>2 = arithmetic mean, {@link net.sf.basedb.core.Formula.AverageMethod#ARITHMETIC_MEAN}; this formula uses arithmetic mean
-    <li>3 = min, {@link net.sf.basedb.core.Formula.AverageMethod#MIN}; this formula uses the min value as a "mean"
-    <li>4 = max, {@link net.sf.basedb.core.Formula.AverageMethod#MAX}; this formula uses the max value as a "mean"
+    <li>0 = none, {@link net.sf.basedb.core.Formula.AverageMethod#NONE}; 
+      no average is defined for this formula
+    <li>1 = geometric mean, {@link net.sf.basedb.core.Formula.AverageMethod#GEOMETRIC_MEAN}; 
+      this formula uses geometric mean
+    <li>2 = arithmetic mean, {@link net.sf.basedb.core.Formula.AverageMethod#ARITHMETIC_MEAN}; 
+      this formula uses arithmetic mean
+    <li>3 = min, {@link net.sf.basedb.core.Formula.AverageMethod#MIN}; 
+      this formula uses the min value as a "mean"
+    <li>4 = max, {@link net.sf.basedb.core.Formula.AverageMethod#MAX}; 
+      this formula uses the max value as a "mean"
     </ul>
     
     @hibernate.property column="`average_method`" type="int" not-null="true"
+    @since 2.4
   */
   public int getAverageMethod()

trunk/src/core/net/sf/basedb/core/data/FormulaData.java

@@ -48 +48 @@
     The average method for thid formula: 
     <ul>
-    <li>0 = none, {@link net.sf.basedb.core.Formula.AverageMethod#NONE}; no average is defined for this formula
-    <li>1 = geometric mean, {@link net.sf.basedb.core.Formula.AverageMethod#GEOMETRIC_MEAN}; this formula uses geometric mean
-    <li>2 = arithmetic mean, {@link net.sf.basedb.core.Formula.AverageMethod#ARITHMETIC_MEAN}; this formula uses arithmetic mean
-    <li>3 = min, {@link net.sf.basedb.core.Formula.AverageMethod#MIN}; this formula uses the min value as a "mean"
-    <li>4 = max, {@link net.sf.basedb.core.Formula.AverageMethod#MAX}; this formula uses the max value as a "mean"
+    <li>0 = none, {@link net.sf.basedb.core.Formula.AverageMethod#NONE}; 
+      no average is defined for this formula
+    <li>1 = geometric mean, {@link net.sf.basedb.core.Formula.AverageMethod#GEOMETRIC_MEAN}; 
+      this formula uses geometric mean
+    <li>2 = arithmetic mean, {@link net.sf.basedb.core.Formula.AverageMethod#ARITHMETIC_MEAN}; 
+      this formula uses arithmetic mean
+    <li>3 = min, {@link net.sf.basedb.core.Formula.AverageMethod#MIN}; 
+      this formula uses the min value as a "mean"
+    <li>4 = max, {@link net.sf.basedb.core.Formula.AverageMethod#MAX}; 
+      this formula uses the max value as a "mean"
     </ul>
     
     @hibernate.property column="`average_method`" type="int" not-null="true"
+    @since 2.4
   */
   public int getAverageMethod()

trunk/src/core/net/sf/basedb/core/query/Aggregations.java

@@ -51 +51 @@
     Calculates the geometric mean of all values for an expression: new expression = 
     EXP(AVG(LN(e))). Note that this method can handle values less then or equal with
-    0 due although the mathematical definition of geometric mean doesn't alow it. 
+    0 although the mathematical definition of geometric mean doesn't allow it. 
     This is caused by the way that sql handle null values in aggregated operations. 
     The geometric mean of the numbers [2, -5, 8] is therefor 4 (because ln(-5) is 
@@ -60 +60 @@
     @return The new Expression
     @throws InvalidDataException If the expression is null
+    @since 2.4
   */
   public static Expression geometricMean(Expression e)

trunk/src/core/net/sf/basedb/core/query/GeometricMeanExpression.java

@@ -34 +34 @@
 
   @author Johan Enell
-  @version 2.0
+  @version 2.4
   @see Aggregations#geometricMean(Expression)
   @base.modified $Date$