WIP Makie plotting (#449)

* Remove old Requires compatibility tricks

* Semi ok Makie extension (first pass)

This has an issue where calling a specific recipe will work fine,
but calling `plot` will not utilize cycled color.

Author: asinghvi17

Project.toml

@@ -14,6 +14,7 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 [weakdeps]
 ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
 FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
+Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
 Optim = "429524aa-4258-5aef-a3af-852621145aeb"
 RegularizationTools = "29dad682-9a27-4bc3-9c72-016788665182"
 SparseConnectivityTracer = "9f842d2f-2579-4b1d-911e-f412cf18a3f5"
@@ -26,6 +27,7 @@ DataInterpolationsOptimExt = "Optim"
 DataInterpolationsRegularizationToolsExt = "RegularizationTools"
 DataInterpolationsSparseConnectivityTracerExt = ["SparseConnectivityTracer", "FillArrays"]
 DataInterpolationsSymbolicsExt = "Symbolics"
+DataInterpolationsMakieExt = "Makie"
 
 [compat]
 Aqua = "0.8"
@@ -37,6 +39,7 @@ FindFirstFunctions = "1.3"
 FiniteDifferences = "0.12.31"
 ForwardDiff = "0.10.36, 1"
 LinearAlgebra = "1.10"
+Makie = "0.22, 0.23, 0.24"
 Optim = "1.6"
 PrettyTables = "2"
 QuadGK = "2.9.1"
@@ -58,6 +61,7 @@ BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
 ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
 FiniteDifferences = "26cc04aa-876d-5657-8c51-4c34ba976000"
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
+Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
 Optim = "429524aa-4258-5aef-a3af-852621145aeb"
 QuadGK = "1fd47b50-473d-5c70-9696-f719f8f3bcdc"
 RegularizationTools = "29dad682-9a27-4bc3-9c72-016788665182"

ext/DataInterpolationsChainRulesCoreExt.jl

@@ -1,19 +1,11 @@
 module DataInterpolationsChainRulesCoreExt
-if isdefined(Base, :get_extension)
-    using DataInterpolations: _interpolate, derivative, AbstractInterpolation,
-                              LinearInterpolation, QuadraticInterpolation,
-                              LagrangeInterpolation, AkimaInterpolation,
-                              BSplineInterpolation, BSplineApprox, get_idx, get_parameters,
-                              munge_data
-    using ChainRulesCore
-else
-    using ..DataInterpolations: _interpolate, derivative, AbstractInterpolation,
-                                LinearInterpolation, QuadraticInterpolation,
-                                LagrangeInterpolation, AkimaInterpolation,
-                                BSplineInterpolation, BSplineApprox, get_parameters,
-                                munge_data
-    using ..ChainRulesCore
-end
+
+using DataInterpolations: _interpolate, derivative, AbstractInterpolation,
+                            LinearInterpolation, QuadraticInterpolation,
+                            LagrangeInterpolation, AkimaInterpolation,
+                            BSplineInterpolation, BSplineApprox, get_idx, get_parameters,
+                            munge_data
+using ChainRulesCore
 
 function ChainRulesCore.rrule(::typeof(munge_data), u, t)
     u_out, t_out = munge_data(u, t)

ext/DataInterpolationsMakieExt.jl

@@ -0,0 +1,41 @@
+module DataInterpolationsMakieExt
+
+using DataInterpolations
+using DataInterpolations: AbstractInterpolation
+using Makie
+
+# Define the default type of plot that you want
+Makie.plottype(::AbstractInterpolation) = Makie.ScatterLines
+
+# Define the attributes that you want to use
+Makie.used_attributes(::Makie.PointBased, ::AbstractInterpolation) = (:plotdensity, :denseplot)
+Makie.used_attributes(::Type{<:Makie.ScatterLines}, ::AbstractInterpolation) = (:plotdensity, :denseplot)
+
+# Define the conversion of the data to the plot
+function Makie.convert_arguments(
+    ::Makie.PointBased,
+    A::AbstractInterpolation;
+    plotdensity = 10_000,
+    denseplot = true,
+)
+    DataInterpolations.to_plottable(A; plotdensity = plotdensity, denseplot = denseplot)
+end
+
+# Define the conversion of the data to the plot for the ScatterLines type
+# Note that this is a bit of a hack
+# and should actually be handled by a plot! method,
+# except that doesn't work anymore or does it?
+function Makie.convert_arguments(
+    ::Type{<:Makie.ScatterLines},
+    A::AbstractInterpolation;
+    plotdensity = 10_000,
+    denseplot = true,
+)
+    densex, densey = convert_arguments(Makie.PointBased(), A; plotdensity = plotdensity, denseplot = denseplot)
+    return [
+        Makie.SpecApi.Lines(densex, densey),
+        Makie.SpecApi.Scatter(A.t, A.u)
+    ]
+end
+
+end # module

ext/DataInterpolationsOptimExt.jl

@@ -6,8 +6,7 @@ import DataInterpolations: munge_data,
                            ExtrapolationError,
                            integral, IntegralNotFoundError, DerivativeNotFoundError
 
-isdefined(Base, :get_extension) ? (using Optim, ForwardDiff) :
-(using ..Optim, ..ForwardDiff)
+using Optim, ForwardDiff
 
 ### Curvefit
 function Curvefit(u,

ext/DataInterpolationsRegularizationToolsExt.jl

@@ -6,8 +6,7 @@ import DataInterpolations: munge_data, munge_extrapolation,
                            integral
 using LinearAlgebra
 
-isdefined(Base, :get_extension) ? (import RegularizationTools as RT) :
-(import ..RegularizationTools as RT)
+import RegularizationTools as RT
 
 # TODO:
 # x midpoint rule

ext/DataInterpolationsSymbolicsExt.jl

@@ -1,16 +1,9 @@
 module DataInterpolationsSymbolicsExt
 
-if isdefined(Base, :get_extension)
-    using DataInterpolations: AbstractInterpolation
-    import DataInterpolations: derivative
-    using Symbolics
-    using Symbolics: Num, unwrap, SymbolicUtils
-else
-    using ..DataInterpolations: AbstractInterpolation
-    import ..DataInterpolations: derivative
-    using ..Symbolics
-    using ..Symbolics: Num, unwrap, SymbolicUtils
-end
+using DataInterpolations: AbstractInterpolation
+import DataInterpolations: derivative
+using Symbolics
+using Symbolics: Num, unwrap, SymbolicUtils
 
 @register_symbolic (interp::AbstractInterpolation)(t)
 Base.nameof(interp::AbstractInterpolation) = :Interpolation