v3.2.1

Author: ws-garcia

src/LO Basic/VBAExpressionsLib/VBAexpressions.xba

@@ -3399,32 +3399,18 @@ err_Handler:
                                     d_lParenthesis & err.Description & d_rParenthesis
 End Function
 
-Private Function fZero(ByRef aFunction As String, ByVal A As Double, _
-                        ByVal B As Double, Optional epsilon As Double = 0.0000000001, _
-                        Optional includeVarNames As Boolean = True, _
-                        Optional useBisectionMethod As Boolean = False, _
-                        Optional printDebugINFO As Boolean = False) As String
-    If Not useBisectionMethod Then
-        fZero = fZeroMRF(aFunction, A, B, epsilon, includeVarNames, printDebugINFO)
-    Else
-        fZero = fZeroMBM(aFunction, A, B, epsilon, includeVarNames, printDebugINFO)
-    End If
-End Function
-
 ''' <summary>
 '''     Finds a zero of a univariate function ussing a modified bisection method.
 '''     aFunction must be a continuous function f(x) for the interval a <= x <= b.
 ''' </summary>
 ''' <param name="aFunction">Inline function.</param>
 ''' <param name="a">Leftmost interval value.</param>
 ''' <param name="b">Rightmost interval value.</param>
-''' <param name="epsilon">Tolerance (relative error limit).</param>
 ''' <param name="IncludeVarNames">Include variable name in result.</param>
-''' <param name="printDebugINFO">Print information like iteraction count.</param>
+''' <param name="epsilon">Tolerance (relative error limit).</param>
 Private Function fZeroMBM(ByRef aFunction As String, ByVal A As Double, _
-                        ByVal B As Double, Optional epsilon As Double = 0.0000000001, _
-                        Optional includeVarNames As Boolean = True, _
-                        Optional printDebugINFO As Boolean = False) As String
+                        ByVal B As Double, Optional includeVarNames As Boolean = True, _
+                        Optional epsilon As Double = 0.0000000001) As String
     Dim absFC As Double, absFD As Double
     Dim aZero As Double
     Dim c As Double, d As Double   'Intermediate points |a---:c:----:d:---b|
@@ -3516,7 +3502,7 @@ Private Function fZeroMBM(ByRef aFunction As String, ByVal A As Double, _
         .LetVarValue(tmpVar(varIdx), tmpResult)
         If Round(tmpFzeroEval, Len(CStr(1 / aZero)) - 1) = 0 Then
             If includeVarNames Then
-                fZeroMBM = .CurrentVarValues
+                fZeroMBM = ToLiteralString(.CurrentVarValues)
             Else
                 fZeroMBM = tmpResult
             End If
@@ -3526,9 +3512,6 @@ Private Function fZeroMBM(ByRef aFunction As String, ByVal A As Double, _
     End With
 fZeroMBM_terminate:
     Set fEvalHelper = Nothing
-    If printDebugINFO Then
-        'Debug.Print "fZeroMBM: " & vbCrLf & vbTab & vbTab & "Evaluations:"; evalCounter; "; Iteractions:"; k
-    End If
     Exit Function
 fZeroMBM_errHandler:
     fZeroMBM = e_ValueError