Merge pull request pentaho#323 from mkambol/mondrian-1519

[MONDRIAN-1519] Median from set of one member is returned as 50% from m...
waded · May 23, 2014 · 365debd · 365debd
2 parents 0951f8e + c3956f2
commit 365debd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/main/mondrian/olap/fun/FunUtil.java b/src/main/mondrian/olap/fun/FunUtil.java
@@ -5,10 +5,9 @@
 // You must accept the terms of that agreement to use this software.
 //
 // Copyright (C) 2002-2005 Julian Hyde
-// Copyright (C) 2005-2013 Pentaho and others
+// Copyright (C) 2005-2014 Pentaho and others
 // All Rights Reserved.
 */
-
 package mondrian.olap.fun;
 
 import mondrian.calc.*;
@@ -1229,7 +1228,7 @@ static double percentile(
         } else if (p >= 1.0) {
             return asArray[length - 1];
         } else if (length == 1) {
-            return asArray[0] * p;
+            return asArray[0];
         } else if (p == 0.5) {
             // Special case for median.
             if ((length & 1) == 1) {

diff --git a/testsrc/main/mondrian/olap/fun/FunctionTest.java b/testsrc/main/mondrian/olap/fun/FunctionTest.java
@@ -5,10 +5,9 @@
 // You must accept the terms of that agreement to use this software.
 //
 // Copyright (C) 2003-2005 Julian Hyde
-// Copyright (C) 2005-2013 Pentaho and others
+// Copyright (C) 2005-2014 Pentaho and others
 // All Rights Reserved.
 */
-
 package mondrian.olap.fun;
 
 import mondrian.olap.*;
@@ -3298,6 +3297,10 @@ public void testMedian() {
             "MEDIAN({[Store].[All Stores].[USA].children},"
             + "[Measures].[Store Sales])",
             "159,167.84");
+        // single value
+        assertExprReturns(
+            "MEDIAN({[Store].[All Stores].[USA]}, [Measures].[Store Sales])",
+            "565,238.13");
     }
 
     public void testMedian2() {
@@ -3409,13 +3412,13 @@ public void testPercentile() {
     public void testPercentileBugMondrian1045() {
         assertExprReturns(
             "Percentile({[Store].[All Stores].[USA]}, [Measures].[Store Sales], 50)",
-            "282,619.07");
+            "565,238.13");
         assertExprReturns(
             "Percentile({[Store].[All Stores].[USA]}, [Measures].[Store Sales], 40)",
-            "226,095.25");
+            "565,238.13");
         assertExprReturns(
             "Percentile({[Store].[All Stores].[USA]}, [Measures].[Store Sales], 95)",
-            "536,976.22");
+            "565,238.13");
     }
 
     public void testMin() {