Merge pull request #90 from SciML/fix-parsing-error-and-format

Fix parsing error and apply JuliaFormatter code formatting

Author: ChrisRackauckas

src/StochasticDelayDiffEq.jl

@@ -17,7 +17,7 @@ import FastPower
 import SciMLBase
 using DiffEqBase: AbstractSDDEProblem, AbstractSDDEAlgorithm, AbstractRODESolution,
                   AbstractRODEFunction, AbstractSDEIntegrator, AbstractSDDEIntegrator,
-                  DEIntegrator, DEAlgorithm, AbstractRODEAlgorithm, AbstractSDEAlgorithm
+                  DEIntegrator, DEAlgorithm, AbstractRODEAlgorithm, AbstractSDEAlgorithm, @..
 
 import DelayDiffEq: constant_extrapolant!, constant_extrapolant,
                     AbstractMethodOfStepsAlgorithm, iscomposite, MethodOfSteps

src/functionwrapper.jl

@@ -8,8 +8,9 @@ end
 (g::SDEDiffusionTermWrapper{true})(du, u, p, t) = g.g(du, u, g.h, p, t)
 (g::SDEDiffusionTermWrapper{false})(u, p, t) = g.g(u, g.h, p, t)
 
-struct SDEFunctionWrapper{iip, F, G, H, TMM, Ta, Tt, TJ, JVP, VJP, JP, SP, TW, TWt, TPJ, GG,
-                          TCV, ID, S} <: DiffEqBase.AbstractRODEFunction{iip}
+struct SDEFunctionWrapper{
+    iip, F, G, H, TMM, Ta, Tt, TJ, JVP, VJP, JP, SP, TW, TWt, TPJ, GG,
+    TCV, ID, S} <: DiffEqBase.AbstractRODEFunction{iip}
     f::F
     g::G
     h::H
@@ -51,13 +52,13 @@ function wrap_functions_and_history(f::SDDEFunction, g, h)
     end
 
     SDEFunctionWrapper{isinplace(f), typeof(f.f), typeof(gwh), typeof(h),
-                       typeof(f.mass_matrix),
-                       typeof(f.analytic), typeof(f.tgrad), typeof(jac), typeof(f.jvp),
-                       typeof(f.vjp), typeof(f.jac_prototype), typeof(f.sparsity),
-                       typeof(f.Wfact), typeof(f.Wfact_t), typeof(f.paramjac),
-                       typeof(f.ggprime), typeof(f.colorvec), typeof(f.initialization_data),
-                       typeof(f.sys)}(f.f, gwh, h, f.mass_matrix, f.analytic, f.tgrad, jac,
-                       f.jvp, f.vjp, f.jac_prototype, f.sparsity, f.Wfact, f.Wfact_t, f.paramjac,
-                       f.ggprime, f.colorvec, f.initialization_data, f.sys),
+        typeof(f.mass_matrix),
+        typeof(f.analytic), typeof(f.tgrad), typeof(jac), typeof(f.jvp),
+        typeof(f.vjp), typeof(f.jac_prototype), typeof(f.sparsity),
+        typeof(f.Wfact), typeof(f.Wfact_t), typeof(f.paramjac),
+        typeof(f.ggprime), typeof(f.colorvec), typeof(f.initialization_data),
+        typeof(f.sys)}(f.f, gwh, h, f.mass_matrix, f.analytic, f.tgrad, jac,
+        f.jvp, f.vjp, f.jac_prototype, f.sparsity, f.Wfact, f.Wfact_t, f.paramjac,
+        f.ggprime, f.colorvec, f.initialization_data, f.sys),
     gwh
 end

src/integrators/interface.jl

@@ -18,15 +18,15 @@ function (integrator::HistorySDEIntegrator)(t, deriv::Type = Val{0}; idxs = noth
 end
 
 function (integrator::HistorySDEIntegrator)(val::AbstractArray,
-                                            t::Union{Number, AbstractArray},
-                                            deriv::Type = Val{0}; idxs = nothing)
+        t::Union{Number, AbstractArray},
+        deriv::Type = Val{0}; idxs = nothing)
     StochasticDiffEq.current_interpolant!(val, t, integrator, idxs, deriv)
 end
 
 mutable struct SDDEIntegrator{algType, IIP, uType, uEltype, tType, P, eigenType,
-                              tTypeNoUnits, uEltypeNoUnits, randType, randType2, rateType,
-                              solType, cacheType, F, G, F6, OType, noiseType,
-                              EventErrorType, CallbackCacheType, H, IType, IA} <:
+    tTypeNoUnits, uEltypeNoUnits, randType, randType2, rateType,
+    solType, cacheType, F, G, F6, OType, noiseType,
+    EventErrorType, CallbackCacheType, H, IType, IA} <:
                AbstractSDDEIntegrator{algType, IIP, uType, tType}
     f::F
     g::G
@@ -89,6 +89,6 @@ function (integrator::SDDEIntegrator)(t, deriv::Type = Val{0}; idxs = nothing)
 end
 
 function (integrator::SDDEIntegrator)(val::AbstractArray, t::Union{Number, AbstractArray},
-                                      deriv::Type = Val{0}; idxs = nothing)
+        deriv::Type = Val{0}; idxs = nothing)
     StochasticDiffEq.current_interpolant!(val, t, integrator, idxs, deriv)
 end

src/integrators/type.jl

@@ -9,7 +9,7 @@
         elseif tdir_t > tdir_ts_top
             if !integrator.dtchangeable
                 change_t_via_interpolation!(integrator, integrator.tdir * pop!(tstops),
-                                            Val{true})
+                    Val{true})
                 integrator.just_hit_tstop = true
             else
                 error("Something went wrong. Integrator stepped past tstops but the algorithm was dtchangeable. Please report this error.")
@@ -55,7 +55,8 @@ function handle_discontinuities!(integrator::SDDEIntegrator)
         maxΔt = 10eps(integrator.t)
 
         while !isempty(integrator.opts.d_discontinuities) &&
-            abs(first(integrator.opts.d_discontinuities).t - integrator.tdir * integrator.t) <
+            abs(first(integrator.opts.d_discontinuities).t -
+                integrator.tdir * integrator.t) <
             maxΔt
             d2 = pop!(integrator.opts.d_discontinuities)
             order = min(order, d2.order)