Merge pull request #146 from odow/fix-visualize

Fix plotting on *NIX machines
odow · Jun 17, 2018 · 5c1d317 · 5c1d317
2 parents ab81770 + 990ac40
commit 5c1d317
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/src/visualizer/visualize.jl b/src/visualizer/visualize.jl
@@ -8,7 +8,7 @@
 
 const ASSET_DIR = dirname(@__FILE__)
 
-function launch_file(html_string, assets, outputfile=replace(tempname(), ".tmp", ".html"))
+function launch_file(html_string, assets, outputfile)
     for asset in assets
         cp(joinpath(ASSET_DIR, asset), joinpath(dirname(outputfile), asset), remove_destination=true)
     end

diff --git a/src/visualizer/visualize_simulation.jl b/src/visualizer/visualize_simulation.jl
@@ -81,21 +81,22 @@ function addplot!(p::SimulationPlot, i::AbstractVector{Int}, t::AbstractVector{I
 	end
 	push!(p.data, plot_dict)
 end
+
 """
 	show(p::SimulationPlot)
 
-# Description
-
 Launch a browser and render the SimulationPlot plot `p`.
 """
-function Base.show(p::SimulationPlot)
-	html = prephtml(p)
-	launch_file(html, SIMULATION_ASSETS)
-end
+Base.show(p::SimulationPlot) = Base.show(joinpath(tempdir(), string(randstring(), ".html")), p)
 
+"""
+	show(filename::String, p::SimulationPlot)
+
+Launch a browser and render the SimulationPlot plot `p`. Save the resulting
+HTML file to `filename`.
+"""
 function Base.show(filename::String, p::SimulationPlot)
-	html = prephtml(p)
-	launch_file(html, SIMULATION_ASSETS, filename)
+	launch_file(prephtml(p), SIMULATION_ASSETS, filename)
 end
 
 prephtml(p::SimulationPlot) = prephtml(SIMULATION_HTML_FILE, ("<!--DATA-->", json(p.data)))
diff --git a/src/visualizer/visualize_value_function.jl b/src/visualizer/visualize_value_function.jl
@@ -97,8 +97,8 @@ At most two states can be vectors.
     SDDP.plotvaluefunction(m, 2, 1, 0.0:0.1:1.0, 0.5, 0.0:0.1:1.0; label1="State 1", label2="State 3")
 """
 function plotvaluefunction(m::SDDPModel, stage::Int, markovstate::Int, states::Union{Float64, AbstractVector{Float64}}...; label1="State 1", label2="State 2")
-    html = prepvaluefunctionplot(m, stage, markovstate, label1, label2, states...)
-    launch_file(html, PLOTLY_ASSETS)
+    filename = joinpath(tempdir(), string(randstring(), ".html"))
+    plotvaluefunction(filename, m, stage, markovstate, states...; label1=label1, label2=label2)
 end
 
 function plotvaluefunction(filename::String, m::SDDPModel, stage::Int, markovstate::Int, states::Union{Float64, AbstractVector{Float64}}...; label1="State 1", label2="State 2")