Updated to julia1.0 and new ControlSystems reference

Author: mfalt

REQUIRE

@@ -1,5 +1,7 @@
-julia 0.4
+julia 0.7
 VisualRegressionTests
 ControlSystems
 Plots
 GR
+Gtk
+ImageMagick

src/ControlExamplePlots.jl

@@ -1,6 +1,6 @@
 module ControlExamplePlots
 
-using ControlSystems, Plots, VisualRegressionTests
+using ControlSystems, Plots, VisualRegressionTests, Gtk
 
 include("genplots.jl")
 

src/figures/bode.png

@@ -1,38 +1,37 @@
 export genplots, getexamples, runplotgen
 
-@doc """ results = runplotgen()
+""" results = runplotgen()
 Run full generation of the plots needed for the tests in ControlSystems.jl
-""" ->
+"""
 function runplotgen()
   funcs, refs, eps = getexamples()
   genplots(funcs, refs, eps=eps)
 end
 
-@doc """ results = genplots(funcs, refs; eps, kwargs...)
+""" results = genplots(funcs, refs; eps, kwargs...)
 Generate the plots needed for the tests in ControlSystems.jl
-""" ->
+"""
 function genplots(funcs, refs; eps=0.01*ones(length(refs)), kwargs...)
     ENV["MPLBACKEND"] = "Agg"
-    results = Array{VisualRegressionTests.VisualTestResult,1}(length(refs))
+    results = Array{VisualRegressionTests.VisualTestResult,1}(undef, length(refs))
     #Run/generate tests
     for (i,ref) in enumerate(refs)
         testf(fn) = png(funcs[i](), fn)
-        results[i] = test_images(VisualTest(testf, ref); eps=eps[i], kwargs...)
+        results[i] = test_images(VisualTest(testf, ref); tol=eps[i], kwargs...)
     end
     results
 end
 
-@doc """funcs, refs, eps = getexamples()
+"""funcs, refs, eps = getexamples()
 Get the example functions and locations of reference plots needed for the tests in ControlSystems.jl
-""" ->
+"""
 function getexamples()
-    tf1 = tf([1],[1,1], inputnames=["Inp1"], outputnames=["Out1"])
-    tf2 = tf([1/5,2],[1,1,1], inputnames=["Inp2"], outputnames=["Out1"])
+    tf1 = tf([1],[1,1])
+    tf2 = tf([1/5,2],[1,1,1])
     sys = [tf1 tf2]
-    sysss = ss([-1 2; 0 1], [1 0; 1 1], [1 0; 0 1], [0.1 0; 0 -0.2],
-        inputnames=["MyIn1", "MyIn2"], statenames=["State1", "State2"])
+    sysss = ss([-1 2; 0 1], [1 0; 1 1], [1 0; 0 1], [0.1 0; 0 -0.2])
 
-    ws = logspace(-2,2,200)
+    ws = 10.0 .^range(-2,stop=2,length=200)
     ts = 0:0.01:5
     bodegen() = begin
       setPlotScale("dB")
@@ -45,7 +44,7 @@ function getexamples()
 
     stepgen() = stepplot(sys, ts[end], ts[2]-ts[1], l=(:dash, 4))
     impulsegen() = impulseplot(sys, ts[end], ts[2]-ts[1], l=:blue)
-    L = lqr(sysss.A, sysss.B, eye(2), eye(2))
+    L = lqr(sysss.A, sysss.B, [1 0; 0 1], [1 0; 0 1])
     lsimgen() = lsimplot(sysss, (x,i)->-L*x, ts, [1;2])
 
     margingen() = marginplot([tf1, tf2], ws)
@@ -56,11 +55,11 @@ function getexamples()
     pzmapgen() = pzmap(tf2, xlims=(-15,5))
     rlocusgen() = rlocusplot(tf2)
 
-    plotsdir = Pkg.dir("ControlExamplePlots")*"/src/figures/"
+    plotsdir = joinpath(dirname(pathof(ControlExamplePlots)), "..", "src", "figures")
     refs = ["bode.png", "nyquist.png", "sigma.png", "nichols.png", "step.png",
             "impulse.png", "lsim.png", "margin.png", "gangoffour.png", "pzmap.png", "rlocus.png"]
     funcs = [bodegen, nyquistgen, sigmagen, nicholsgen, stepgen,
              impulsegen, lsimgen, margingen, gangoffourgen, pzmapgen, rlocusgen]
     eps = 0.001*ones(length(refs));
-    funcs, map(s -> plotsdir*s, refs), eps
+    funcs, map(s -> joinpath(plotsdir,s), refs), eps
 end