Merge pull request #203 from IBM/plotting_bug

fix plotting issue not displaying in notebooks
IBM · Apr 6, 2023 · 0ad5e73 · 0ad5e73 · ppalmes · Apr 6, 2023
2 parents 07c32ff + dcb96a0
commit 0ad5e73
Show file tree

Hide file tree

Showing 10 changed files with 1,253 additions and 25,936 deletions.
diff --git a/Project.toml b/Project.toml
@@ -26,7 +26,7 @@ CSV = "0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 0.10"
 DataFrames = "0.17, 0.18, 0.19, 0.20, 0.21, 0.22, 1.0, 1.1, 1.2"
 Impute = "0.5, 0.6"
 MLDataUtils = "0.2, 0.3, 0.4, 0.5"
-MultivariateStats = "0.5, 0.6, 0.7, 0.8, 0.9"
+MultivariateStats = "0.5, 0.6, 0.7, 0.8, 0.9, 0.10"
 RecipesBase = "1.1"
 StatsBase = "0.29, 0.30, 0.31, 0.32, 0.33"
 julia = "1"

diff --git a/docs/notebooks/InteractivePlotting.jl.ipynb b/docs/notebooks/InteractivePlotting.jl.ipynb
diff --git a/docs/notebooks/JuliaCon2019.jl.ipynb b/docs/notebooks/JuliaCon2019.jl.ipynb
diff --git a/docs/notebooks/Project.toml b/docs/notebooks/Project.toml
@@ -0,0 +1,8 @@
+[deps]
+CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
+DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
+Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
+IJulia = "7073ff75-c697-5162-941a-fcdaad2a7d2a"
+Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
+Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+TSML = "198dc43e-9e51-5cd7-9d40-d9794d335912"
diff --git a/docs/notebooks/StaticPlotting.jl.ipynb b/docs/notebooks/StaticPlotting.jl.ipynb
diff --git a/docs/notebooks/StatifierNotebook.jl.ipynb b/docs/notebooks/StatifierNotebook.jl.ipynb
diff --git a/docs/notebooks/TSMLClassifiers.ipynb b/docs/notebooks/TSMLClassifiers.ipynb
@@ -61,14 +61,15 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
+    "scrolled": true,
     "slideshow": {
      "slide_type": "subslide"
     }
    },
    "outputs": [],
    "source": [
     "@everywhere using TSML\n",
-    "@everywhere using TSMLextra\n",
+    "@everywhere using TSMLExtra\n",
     "@everywhere using DataFrames\n",
     "@everywhere using Random\n",
     "@everywhere using Statistics\n",
@@ -275,15 +276,15 @@
   },
   "celltoolbar": "Slideshow",
   "kernelspec": {
-   "display_name": "Julia 1.2.0",
+   "display_name": "Julia 1.8.5",
    "language": "julia",
-   "name": "julia-1.2"
+   "name": "julia-1.8"
   },
   "language_info": {
    "file_extension": ".jl",
    "mimetype": "application/julia",
    "name": "julia",
-   "version": "1.2.0"
+   "version": "1.8.5"
   }
  },
  "nbformat": 4,

diff --git a/docs/notebooks/TSML_Demo.ipynb b/docs/notebooks/TSML_Demo.ipynb
diff --git a/src/plotter.jl b/src/plotter.jl
@@ -28,12 +28,12 @@ export Plotter
 #  return nothing
 #end
 
-struct DateVal{D<:DateTime,V<:Union{Missing,Real}}
+struct DateVal{D<:DateTime,V<:Union{Missing,<:Number}}
    dtime::Vector{D}
    values::Vector{V}
 end
 
-@recipe function plot(dt::DateVal,sz=(390,200))
+@recipe function plot(dt::DateVal,sz=(390,200)) 
    marker := :none
    markertype --> :none
    seriestype := :path
@@ -127,7 +127,7 @@ function transform!(pltr::Plotter, features::DataFrame)::DataFrame
       sz = (390,200)
    end
    dtval = DateVal(df.Date,df.Value)
-   RecipesBase.plot(dtval,sz)
+   display(RecipesBase.plot(dtval,sz))
    return features
 end
 

diff --git a/src/valdatefilters.jl b/src/valdatefilters.jl
@@ -8,7 +8,7 @@ using DataFrames: DataFrame,rename!,ncol,groupby,combine,leftjoin,innerjoin
 using MLDataUtils: slidingwindow
 
 using Impute
-using Impute: impute, impute!, interp, interp!, locf, nocb
+using Impute: impute, impute!, interp, interp!, locf, nocb, knn
 export impute, impute!, interp, interp!, locf, nocb
 
 using ..AbsTypes