diff --git a/IntegrationUtilityFunctions.m b/IntegrationUtilityFunctions.m index 9fcd0c3..a43aa30 100644 --- a/IntegrationUtilityFunctions.m +++ b/IntegrationUtilityFunctions.m @@ -4103,13 +4103,13 @@ DownValues[Star]={}; - +(* Star::error = "Inert multiplication by zero!"; Star[u_,v_] := ( Message[Star::error]; 0 ) /; EqQ[u,0] - +*) Star[u_,v_] := Map[Function[Star[u,#]],v] /; @@ -7734,11 +7734,8 @@ If u is an expression of the form f (Sqrt[a+b*x+c*x^2],x), f (x,x) is a rational ClearAll[FixIntRules,FixIntRule,FixRhsIntRule] -dvMathicsToMath = RuleDelayed[Verbatim[HoldPattern][Verbatim[Condition][lhs_,cond_]],rhs_] :> RuleDelayed[HoldPattern[lhs],Condition[rhs,cond]]; -dvMathToMathics = RuleDelayed[Verbatim[HoldPattern][lhs_], Verbatim[Condition][rhs_,cond_]] :> RuleDelayed[HoldPattern[Condition[lhs,cond]],rhs]; - FixIntRules[] := - (DownValues[Int]=FixIntRules[DownValues[Int] /. dvMathicsToMath] /. dvMathToMathics; Null) + (DownValues[Int]=FixIntRules[DownValues[Int]]; Null) FixIntRules[rulelist_] := Block[{Int, Subst, Simp, Star}, diff --git a/Rubi.m b/Rubi.m index 975ac6b..cc74598 100644 --- a/Rubi.m +++ b/Rubi.m @@ -217,6 +217,11 @@ TraceBuiltins[DownValues[Int] = DownValues[Int] /. dvFixWith /. dvFixWithNoCond, SortBy->"count"]; Print[""]; +(* Dummy CheckArguments *) +CheckArguments[a_, n_] := n == 1; +CheckArguments[f_[args___], n_] := Length[{args}] == n; +SetAttributes[CheckArguments, HoldFirst]; + If[$LoadShowSteps === True, StatusBarPrint["Modifying " <> ToString[$RuleCount] <> " integration rules to display steps..."]; StepFunction[Int]; diff --git a/Test.m b/Test.m index ab59221..02df994 100644 --- a/Test.m +++ b/Test.m @@ -37,7 +37,7 @@ (* ::Section::Closed:: *) (*Mathematica Test Functions*) -If[Not[ValueQ[$ItegrationTestProgramDir], $IntegrationTestProgramDir = Directory[]]]; +If[Not[ValueQ[$ItegrationTestProgramDir]], $IntegrationTestProgramDir = Directory[]]; Begin["`Private`"];