Skip to content

Commit

Permalink
documentation updated
Browse files Browse the repository at this point in the history
  • Loading branch information
@montyvesselinov
montyvesselinov committed May 27, 2017
1 parent 1ebd7a0 commit 07739c8
Show file tree
Hide file tree
Showing 11 changed files with 3,603 additions and 1,784 deletions.
1,007 changes: 526 additions & 481 deletions docs/build/Mads.md
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/anasol/runtests.jl
View file
Expand Up @@ -188,4 +188,4 @@ Mads.rmfiles_ext("dat"; path=workdir)
Mads.rmfiles_ext("iterationresults"; path=workdir)
Mads.rmdir("w01shortexp_restart")

Mads.rmdir("w01-w13a_w20a_restart")
Mads.rmdir("w01-w13a_w20a_restart"; path=pwd())
Binary file modified site/EXAMPLES/contamination/w01-bayes.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
762 changes: 628 additions & 134 deletions site/EXAMPLES/contamination/w01-w13a_w20a-calib-match.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
762 changes: 628 additions & 134 deletions site/EXAMPLES/contamination/w01-w13a_w20a-init-match.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified site/EXAMPLES/contamination/w01-w13a_w20a-posterior-1000-spaghetti.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,767 changes: 1,254 additions & 513 deletions site/EXAMPLES/contamination/w01-w13a_w20a-prior-100-spaghetti.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,015 changes: 530 additions & 485 deletions site/Modules/Mads/index.html
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions site/Modules/SVR/index.html
View file
Expand Up @@ -598,27 +598,27 @@ <h1 id="svrjl">SVR.jl</h1>
<p><a id='SVR.freemodel-Tuple{SVR.svmmodel}' href='#SVR.freemodel-Tuple{SVR.svmmodel}'>#</a>
<strong><code>SVR.freemodel</code></strong> &mdash; <em>Method</em>.</p>
<p>Free a libSVM model</p>
<p><a target='_blank' href='https://github.com/madsjulia/SVR.jl/tree/f234d037f8e1952ac82f39db940177c76f61e90e/src/SVR.jl#L209' class='documenter-source'>source</a><br></p>
<p><a target='_blank' href='https://github.com/madsjulia/SVR.jl/tree/1feea2263006796eb96efc744cb2d1d136722a6a/src/SVR.jl#L209' class='documenter-source'>source</a><br></p>
<p><a id='SVR.loadmodel-Tuple{String}' href='#SVR.loadmodel-Tuple{String}'>#</a>
<strong><code>SVR.loadmodel</code></strong> &mdash; <em>Method</em>.</p>
<p>Load a libSVM model</p>
<p><a target='_blank' href='https://github.com/madsjulia/SVR.jl/tree/f234d037f8e1952ac82f39db940177c76f61e90e/src/SVR.jl#L190' class='documenter-source'>source</a><br></p>
<p><a target='_blank' href='https://github.com/madsjulia/SVR.jl/tree/1feea2263006796eb96efc744cb2d1d136722a6a/src/SVR.jl#L190' class='documenter-source'>source</a><br></p>
<p><a id='SVR.predict-Tuple{SVR.svmmodel,Array}' href='#SVR.predict-Tuple{SVR.svmmodel,Array}'>#</a>
<strong><code>SVR.predict</code></strong> &mdash; <em>Method</em>.</p>
<p>Predict based on a libSVM model</p>
<p><a target='_blank' href='https://github.com/madsjulia/SVR.jl/tree/f234d037f8e1952ac82f39db940177c76f61e90e/src/SVR.jl#L174' class='documenter-source'>source</a><br></p>
<p><a target='_blank' href='https://github.com/madsjulia/SVR.jl/tree/1feea2263006796eb96efc744cb2d1d136722a6a/src/SVR.jl#L174' class='documenter-source'>source</a><br></p>
<p><a id='SVR.readlibsvmfile-Tuple{String}' href='#SVR.readlibsvmfile-Tuple{String}'>#</a>
<strong><code>SVR.readlibsvmfile</code></strong> &mdash; <em>Method</em>.</p>
<p>Read a libSVM file</p>
<p><a target='_blank' href='https://github.com/madsjulia/SVR.jl/tree/f234d037f8e1952ac82f39db940177c76f61e90e/src/SVR.jl#L218' class='documenter-source'>source</a><br></p>
<p><a target='_blank' href='https://github.com/madsjulia/SVR.jl/tree/1feea2263006796eb96efc744cb2d1d136722a6a/src/SVR.jl#L218' class='documenter-source'>source</a><br></p>
<p><a id='SVR.savemodel-Tuple{SVR.svmmodel,String}' href='#SVR.savemodel-Tuple{SVR.svmmodel,String}'>#</a>
<strong><code>SVR.savemodel</code></strong> &mdash; <em>Method</em>.</p>
<p>Save a libSVM model</p>
<p><a target='_blank' href='https://github.com/madsjulia/SVR.jl/tree/f234d037f8e1952ac82f39db940177c76f61e90e/src/SVR.jl#L201' class='documenter-source'>source</a><br></p>
<p><a target='_blank' href='https://github.com/madsjulia/SVR.jl/tree/1feea2263006796eb96efc744cb2d1d136722a6a/src/SVR.jl#L201' class='documenter-source'>source</a><br></p>
<p><a id='SVR.train-Tuple{Array{T,1},Array}' href='#SVR.train-Tuple{Array{T,1},Array}'>#</a>
<strong><code>SVR.train</code></strong> &mdash; <em>Method</em>.</p>
<p>Train based on a libSVM model</p>
<p><a target='_blank' href='https://github.com/madsjulia/SVR.jl/tree/f234d037f8e1952ac82f39db940177c76f61e90e/src/SVR.jl#L164' class='documenter-source'>source</a><br></p>
<p><a target='_blank' href='https://github.com/madsjulia/SVR.jl/tree/1feea2263006796eb96efc744cb2d1d136722a6a/src/SVR.jl#L164' class='documenter-source'>source</a><br></p>



Expand Down
52 changes: 26 additions & 26 deletions site/sitemap.xml
View file
Expand Up @@ -4,23 +4,23 @@

<url>
<loc>http://madsjulia.github.io/Mads.jl/</loc>
<lastmod>2017-05-25</lastmod>
<lastmod>2017-05-26</lastmod>
<changefreq>daily</changefreq>
</url>



<url>
<loc>http://madsjulia.github.io/Mads.jl/installation/</loc>
<lastmod>2017-05-25</lastmod>
<lastmod>2017-05-26</lastmod>
<changefreq>daily</changefreq>
</url>



<url>
<loc>http://madsjulia.github.io/Mads.jl/getting_started/</loc>
<lastmod>2017-05-25</lastmod>
<lastmod>2017-05-26</lastmod>
<changefreq>daily</changefreq>
</url>

Expand All @@ -29,43 +29,43 @@

<url>
<loc>http://madsjulia.github.io/Mads.jl/Examples/setup/</loc>
<lastmod>2017-05-25</lastmod>
<lastmod>2017-05-26</lastmod>
<changefreq>daily</changefreq>
</url>

<url>
<loc>http://madsjulia.github.io/Mads.jl/Examples/bigdt/source_termination/</loc>
<lastmod>2017-05-25</lastmod>
<lastmod>2017-05-26</lastmod>
<changefreq>daily</changefreq>
</url>

<url>
<loc>http://madsjulia.github.io/Mads.jl/Examples/infogap/</loc>
<lastmod>2017-05-25</lastmod>
<lastmod>2017-05-26</lastmod>
<changefreq>daily</changefreq>
</url>

<url>
<loc>http://madsjulia.github.io/Mads.jl/Examples/bayesian_sampling/</loc>
<lastmod>2017-05-25</lastmod>
<lastmod>2017-05-26</lastmod>
<changefreq>daily</changefreq>
</url>

<url>
<loc>http://madsjulia.github.io/Mads.jl/Examples/blind_source_separation/</loc>
<lastmod>2017-05-25</lastmod>
<lastmod>2017-05-26</lastmod>
<changefreq>daily</changefreq>
</url>

<url>
<loc>http://madsjulia.github.io/Mads.jl/Examples/contamination/</loc>
<lastmod>2017-05-25</lastmod>
<lastmod>2017-05-26</lastmod>
<changefreq>daily</changefreq>
</url>

<url>
<loc>http://madsjulia.github.io/Mads.jl/Examples/ode/</loc>
<lastmod>2017-05-25</lastmod>
<lastmod>2017-05-26</lastmod>
<changefreq>daily</changefreq>
</url>

Expand All @@ -74,39 +74,39 @@

<url>
<loc>http://madsjulia.github.io/Mads.jl/Notebooks/</loc>
<lastmod>2017-05-25</lastmod>
<lastmod>2017-05-26</lastmod>
<changefreq>daily</changefreq>
</url>



<url>
<loc>http://madsjulia.github.io/Mads.jl/Examples/</loc>
<lastmod>2017-05-25</lastmod>
<lastmod>2017-05-26</lastmod>
<changefreq>daily</changefreq>
</url>



<url>
<loc>http://madsjulia.github.io/Mads.jl/model_coupling/</loc>
<lastmod>2017-05-25</lastmod>
<lastmod>2017-05-26</lastmod>
<changefreq>daily</changefreq>
</url>



<url>
<loc>http://madsjulia.github.io/Mads.jl/test/</loc>
<lastmod>2017-05-25</lastmod>
<lastmod>2017-05-26</lastmod>
<changefreq>daily</changefreq>
</url>



<url>
<loc>http://madsjulia.github.io/Mads.jl/functions/</loc>
<lastmod>2017-05-25</lastmod>
<lastmod>2017-05-26</lastmod>
<changefreq>daily</changefreq>
</url>

Expand All @@ -115,55 +115,55 @@

<url>
<loc>http://madsjulia.github.io/Mads.jl/Modules/Mads/</loc>
<lastmod>2017-05-25</lastmod>
<lastmod>2017-05-26</lastmod>
<changefreq>daily</changefreq>
</url>

<url>
<loc>http://madsjulia.github.io/Mads.jl/Modules/BIGUQ/</loc>
<lastmod>2017-05-25</lastmod>
<lastmod>2017-05-26</lastmod>
<changefreq>daily</changefreq>
</url>

<url>
<loc>http://madsjulia.github.io/Mads.jl/Modules/Anasol/</loc>
<lastmod>2017-05-25</lastmod>
<lastmod>2017-05-26</lastmod>
<changefreq>daily</changefreq>
</url>

<url>
<loc>http://madsjulia.github.io/Mads.jl/Modules/AffineInvariantMCMC/</loc>
<lastmod>2017-05-25</lastmod>
<lastmod>2017-05-26</lastmod>
<changefreq>daily</changefreq>
</url>

<url>
<loc>http://madsjulia.github.io/Mads.jl/Modules/GeostatInversion/</loc>
<lastmod>2017-05-25</lastmod>
<lastmod>2017-05-26</lastmod>
<changefreq>daily</changefreq>
</url>

<url>
<loc>http://madsjulia.github.io/Mads.jl/Modules/ReusableFunctions/</loc>
<lastmod>2017-05-25</lastmod>
<lastmod>2017-05-26</lastmod>
<changefreq>daily</changefreq>
</url>

<url>
<loc>http://madsjulia.github.io/Mads.jl/Modules/MetaProgTools/</loc>
<lastmod>2017-05-25</lastmod>
<lastmod>2017-05-26</lastmod>
<changefreq>daily</changefreq>
</url>

<url>
<loc>http://madsjulia.github.io/Mads.jl/Modules/RobustPmap/</loc>
<lastmod>2017-05-25</lastmod>
<lastmod>2017-05-26</lastmod>
<changefreq>daily</changefreq>
</url>

<url>
<loc>http://madsjulia.github.io/Mads.jl/Modules/SVR/</loc>
<lastmod>2017-05-25</lastmod>
<lastmod>2017-05-26</lastmod>
<changefreq>daily</changefreq>
</url>

Expand All @@ -172,15 +172,15 @@

<url>
<loc>http://madsjulia.github.io/Mads.jl/acknowledgments/</loc>
<lastmod>2017-05-25</lastmod>
<lastmod>2017-05-26</lastmod>
<changefreq>daily</changefreq>
</url>



<url>
<loc>http://madsjulia.github.io/Mads.jl/copying/</loc>
<lastmod>2017-05-25</lastmod>
<lastmod>2017-05-26</lastmod>
<changefreq>daily</changefreq>
</url>

Expand Down
8 changes: 4 additions & 4 deletions test/io.jl
View file
@@ -1,7 +1,7 @@
import Mads
import Base.Test

# If madsdir = '.' then joinpath, else madsdir
# If madsdir = '.' then joinpath, else madsdir
workdir = (Mads.getmadsdir() == ".") ? joinpath(Mads.madsdir, "..", "test") : Mads.getmadsdir()
@Mads.stderrcapture function jpath(file::String)
joinpath(workdir, file)
Expand All @@ -14,7 +14,7 @@ arr = Dict{String,Float64}("a"=>1, "b"=>1.6) # Define an arbitrary dictionary
ext = Mads.getextension(jpath(file))

if ext == "dat"
Mads.dumpasciifile(jpath(file), data)
Mads.dumpasciifile(jpath(file), data)
loaded_data = Mads.loadasciifile(jpath(file))
loaded_data = Dict{String,Float64}(zip((loaded_data[1], loaded_data[2]), (loaded_data[3], loaded_data[4])))
elseif ext == "json"
Expand All @@ -29,7 +29,7 @@ arr = Dict{String,Float64}("a"=>1, "b"=>1.6) # Define an arbitrary dictionary
return
end
Mads.rmfile(jpath(file))

return (data["a"] == loaded_data["a"]) && (data["b"] == loaded_data["b"])
end

Expand All @@ -39,7 +39,7 @@ end
@Base.Test.test test_IO("a.json", arr)
@Base.Test.test test_IO("a.yaml", arr)
@Base.Test.test test_IO("a.yaml", arr, true)

# Test removal of files based on root/extension
file = "root_testing.extension_testing"

Expand Down

0 comments on commit 07739c8

Please sign in to comment.