Loving spreadsheet formulas

Author: ws-garcia

src/LO Basic/VBAExpressions.update.xml

@@ -2,8 +2,8 @@
 <description xmlns="https://openoffice.org/extensions/update/2006"
   xmlns:xlink="https://www.w3.org/1999/xlink">
   <identifier value="com.ecpsolutions.extensions.vbaexpressions.oxt"/>
-  <version value="1.0.8"/>
+  <version value="1.0.9"/>
   <update-download>
-    <src xlink:href="https://github.com/ws-garcia/VBA-Expressions/releases/download/v3.2.7/VBAExpressions.oxt"/>
+    <src xlink:href="https://github.com/ws-garcia/VBA-Expressions/releases/download/v3.2.8/VBAExpressions.oxt"/>
   </update-download>
 </description>

src/LO Basic/VBAExpressionsLib/TestRunner.xba

@@ -236,6 +236,11 @@ Sub RunAllTests
 			"ROUND(BETAINV(0.5;1;3);8)", _
 			"0.20629947" _
 		)
+	Run( _
+			"Statistical Functions: BETA.DIST", _
+			"ROUND(BETA.DIST(2;8;10;False;1;3);7)", _
+			"1.4837646" _
+		)
 	QRdec("Linear Algebra Functions: QR decomposition")
 	Run( _
 			"Linear Algebra Functions: Cholesky", _

src/LO Basic/VBAExpressionsLib/VBAcallBack.xba

@@ -33,5 +33,4 @@ option ClassModule
 '@--------------------------------------------------------------------
 ' Expose functions defined in the UDFunctions.cls
 Public UserDefFunctions As New UDFunctions
-Public SimpleMath As New clsSimpleMath
 </script:module>

src/LO Basic/VBAExpressionsLib/VBAexpressions.xba

@@ -313,7 +313,7 @@ Private Sub Class_Initialize()
     AscDecSymbol = 46
     P_GALLOPING_MODE = True
     P_FORMATRESULT = False
-    BuildinFunctIDList = "abs;floor;achisq;asin;acos;aerf;afishf;agauss;asc;anorm;atn;astudt;array;avg" & _
+    BuildinFunctIDList = "abs;floor;achisq;asin;acos;aerf;afishf;agauss;asc;anorm;atn;astudt;array;avg;beta.dist" & _
                             ";betainv;ceil;chisq;cholesky;cholinverse;cholsolve;chr;cos;choose;date;dateadd;datediff" & _
                             ";datepart;dateserial;datevalue;day;ddb;det;erf;exp;fishf;fit;format;fv;fzero" & _
                             ";gamma;gammaln;gauss;get;hour;ibeta;iff;inverse;ipmt;irr;lcase;left;len;log;lgn" & _
@@ -323,7 +323,7 @@ Private Sub Class_Initialize()
                             ";syd;tan;timeserial;timevalue;tinv;tinv_1t;tinv_2t;trim;ucase;weekday" & _
                             ";weekdayname;year"
     BuildinFunctNameList = "Absolute;aFloor;ACHISQ;ArcSin;ArcCos;AERF;AFISHF;AGAUSS;ASCII;ANORM;ArcTan" & _
-                            ";ASTUDT;strArray;Average;BETAINV;aCeiling;CHISQ;CholeskyDec;CholeskyInverseMatrix" & _
+                            ";ASTUDT;strArray;Average;Beta_Distribution;BETAINV;aCeiling;CHISQ;CholeskyDec;CholeskyInverseMatrix" & _
                             ";CholeskySolve;ASCIIchr;Cosin;aChoose;aDate;aDateAdd;aDateDiff;aDatePart;aDateSerial" & _
                             ";aDateValue;aDay;aDDB;MatrixDeterminant;ERF;ExpEuler;FISHF;CurveFit" & _
                             ";aFormat;aFV;FunctionZero;Gamma;GammaLN;GAUSS;GET;aHour;iBETA;aIff;InverseMatrix" & _
@@ -1537,6 +1537,102 @@ Private Function BETAINV_(p As Double, A As Double, B As Double) As Double
     BETAINV_ = x
 End Function
 
+''' <summary>
+'''     Returns the beta distribution.
+''' </summary>
+''' <param name="x">The value between A and B at which to evaluate the function.</param>
+''' <param name="alpha">Shape parameter alpha.</param>
+''' <param name="beta">Shape parameter beta.</param>
+''' <param name="Cumulative">
+'''     A logical value that determines the form of the function. If cumulative is TRUE,
+'''     BETADIST returns the cumulative distribution function; if FALSE, it returns
+'''     the probability density function (PDF).
+''' </param>
+''' <param name="A">Optional. A lower bound to the interval of x.</param>
+''' <param name="B">Optional. An upper bound to the interval of x.</param>
+Private Function BETADIST(ByRef expression As String, ByRef fName As String) As String
+    Dim argsCount As Long
+    Dim tmpData() As String
+    Dim tmpEval As String
+    Dim LB As Long, UB As Long
+    
+    On Error GoTo err_Handler
+    tmpData() = SplitArgs(expression)
+    LB = LBound(tmpData)
+    UB = UBound(tmpData)
+    argsCount = UB - LB + 1
+    Select Case argsCount
+        Case 4
+            tmpEval = BETAPDF_EXCEL( _
+                                CDbl(tmpData(LB)), _
+                                CDbl(tmpData(LB + 1)), _
+                                CDbl(tmpData(LB + 2)), _
+                                CBool(tmpData(LB + 3)), _
+                                0, 1)
+        Case 6
+            tmpEval = BETAPDF_EXCEL( _
+                                CDbl(tmpData(LB)), _
+                                CDbl(tmpData(LB + 1)), _
+                                CDbl(tmpData(LB + 2)), _
+                                CBool(tmpData(LB + 3)), _
+                                CDbl(tmpData(LB + 4)), _
+                                CDbl(tmpData(UB)))
+        Case Else
+            tmpEval = e_ValueError
+            BuildErrMessage errMissingArgsOrTooManyArgs, d_lCurly & fName & d_rCurly
+    End Select
+    BETADIST = tmpEval: Erase tmpData
+    Exit Function
+err_Handler:
+    BETADIST = e_ValueError
+    BuildErrMessage errEvalError, d_lCurly & fName & d_rCurly & " | Error#: " & err.Number & d_Space & _
+                                    d_lParenthesis & err.Description & d_rParenthesis
+End Function
+
+Private Function BETALN_(x As Double, y As Double) As Double
+    BETALN_ = GAMMALN_(x) + GAMMALN_(y) - GAMMALN_(x + y)
+End Function
+
+Private Function BETAPDF_(x As Double, Alpha As Double, Beta As Double) As Double
+    BETAPDF_ = Exp((Alpha - 1) * Log(x) + (Beta - 1) * Log(1 - x) - BETALN_(Alpha, Beta))
+End Function
+
+Private Function BETAPDF_EXCEL(x As Double, Alpha As Double, _
+                                    Beta As Double, Cumulative As Boolean, _
+                                    Lower_Bound As Double, _
+                                    Upper_Bound As Double) As Variant
+    Dim z As Double
+    Dim range_ As Double
+    
+    If Upper_Bound > Lower_Bound Then
+        If x > Lower_Bound And x < Upper_Bound Then
+            range_ = (Upper_Bound - Lower_Bound)
+            z = (x - Lower_Bound) / range_
+            If Cumulative Then
+                BETAPDF_EXCEL = iBETA_(z, Alpha, Beta)
+            Else
+                BETAPDF_EXCEL = BETAPDF_(z, Alpha, Beta) / range_
+            End If
+        Else
+            If x = Lower_Bound Or x = Upper_Bound Then
+                If Cumulative Then
+                    If x = Upper_Bound Then
+                        BETAPDF_EXCEL = 1
+                    Else
+                        BETAPDF_EXCEL = 0
+                    End If
+                Else
+                    BETAPDF_EXCEL = 0
+                End If
+            Else
+                BETAPDF_EXCEL = "#NUM!"
+            End If
+        End If
+    Else
+        BETAPDF_EXCEL = "#NUM!"
+    End If
+End Function
+
 Private Sub BottomLevelEval(ByRef aToken As token)
     On Error GoTo BLevelEval_errHanlder
     If aToken.OperationToken < 100 Then 'Arithmetic operators
@@ -2728,6 +2824,8 @@ Private Function EvalFunction(ByRef Argument As String, ByRef FunctionName As St
                 EvalFunction = Asc_(Argument, FunctionName)
             Case "Average"
                 EvalFunction = average(Argument, FunctionName)
+            Case "Beta_Distribution"
+            	EvalFunction = BETADIST(Argument, FunctionName)
             Case "BETAINV"
                 EvalFunction = BETAINV(Argument, FunctionName)
             Case "Cosin"

src/LO Basic/release-notes_en.txt

@@ -1,6 +1,6 @@
-# A note on!
-## Bug Fix
-- [x] Resolved error when parsing literal strings with reserved grammar tokens.
+# Loving spreadsheet formulas!
+## New Functions
+- [x] Added Excel `BETA.DIST` for the cumulative distribution function (CDF) and the probabilistic distribution function (PDF) of the Beta distribution.
 
 ## Download 
-https://github.com/ws-garcia/VBA-Expressions/releases/download/v3.2.7/VBAExpressions.oxt
+https://github.com/ws-garcia/VBA-Expressions/releases/download/v3.2.8/VBAExpressions.oxt