Bug fixes from empty units_ in PE_Functions

Author: s-baumann

src/1_algebra.jl

@@ -201,27 +201,33 @@ end
     Any two MultivariateFunctions can be multiplied to form a MultivariateFunction reflecting the product.
 """
 function *(f1::PE_Function,f2::PE_Function)
-    f1_bases = get_bases(f1)
-    f2_bases = get_bases(f2)
-    min_bases = merge(min, f1_bases, f2_bases)
-    f1_rebase = change_base(f1, min_bases)
-    f2_rebase = change_base(f2, min_bases)
-    L1 = length(f1_rebase)
-    L2 = length(f2_rebase)
-    if (L1 == 1) & (L2 == 1)
-        f1_ = f1_rebase[1]
-        f2_ = f2_rebase[1]
-        new_mult = f1_.multiplier_ * f2_.multiplier_
-        return PE_Function(new_mult, merge(*, f1_.units_, f2_.units_ ))
+    if (length(f1.units_) == 0)
+        return f1.multiplier_ * f2
+    elseif (length(f2.units_) == 0)
+        return f2.multiplier_ * f1
     else
-        PEs = Array{PE_Function,1}()
-        for f in f1_rebase
-            for g in f2_rebase
-                append!(PEs, [f * g])
+        f1_bases = get_bases(f1)
+        f2_bases = get_bases(f2)
+        min_bases = merge(min, f1_bases, f2_bases)
+        f1_rebase = change_base(f1, min_bases)
+        f2_rebase = change_base(f2, min_bases)
+        L1 = length(f1_rebase)
+        L2 = length(f2_rebase)
+        if (L1 == 1) & (L2 == 1)
+            f1_ = f1_rebase[1]
+            f2_ = f2_rebase[1]
+            new_mult = f1_.multiplier_ * f2_.multiplier_
+            return PE_Function(new_mult, merge(*, f1_.units_, f2_.units_ ))
+        else
+            PEs = Array{PE_Function,1}()
+            for f in f1_rebase
+                for g in f2_rebase
+                    append!(PEs, [f * g])
+                end
             end
         end
+        return Sum_Of_Functions(PEs)
     end
-    return Sum_Of_Functions(PEs)
 end
 
 function *(f1::PE_Function, f2::Sum_Of_Functions)

src/2_calculus.jl

@@ -436,7 +436,10 @@ function integral(f::Sum_Of_Piecewise_Functions, limits::Dict{Symbol,Tuple{Float
 end
 
 function integral(f::MultivariateFunction, left_limit::Float64, right_limit::Float64)
-    if underlying_dimensions(f) == Set([default_symbol])
+    underlyingDims = underlying_dimensions(f)
+    if length(underlyingDims) == 0
+        return f.multiplier_ * (right_limit-left_limit)
+    elseif underlyingDims == Set([default_symbol])
         limits_ = Dict{Symbol,Tuple{Float64,Float64}}(default_symbol => Tuple{Float64,Float64}((left_limit,right_limit)))
         return integral(f, limits_)
     else

test/1_test_univariate.jl

@@ -189,3 +189,9 @@ abs(evaluate(test_func, inp) - evaluate(converted_test_func, rescaled_input)) <
 sumFunc = test_func + pe_exp_quad + pe_exp
 converted_sumFunc = convert_to_linearly_rescale_inputs(sumFunc, alpha, beta)
 abs(evaluate(sumFunc, inp) - evaluate(converted_sumFunc, rescaled_input)) < 1e-10
+
+# Multiplications with no units.
+n1 = PE_Function(5.0)
+n2 = PE_Function(12.0)
+abs((n1 * n2).multiplier_ - 60.0) < tol
+abs((n1 * pe_lin).multiplier_ - 10.0) < tol