diff --git a/Project.toml b/Project.toml index 5d23183..b612bf0 100644 --- a/Project.toml +++ b/Project.toml @@ -1,4 +1,4 @@ -name = "Curvefit" +name = "VegCurveFit" uuid = "dec11fe7-d51b-4c55-8237-c7557eff4313" authors = ["Dongdong Kong"] version = "0.1.0" diff --git a/docs/Manifest.toml b/docs/Manifest.toml deleted file mode 100644 index e89fb08..0000000 --- a/docs/Manifest.toml +++ /dev/null @@ -1,89 +0,0 @@ -# This file is machine-generated - editing it directly is not advised - -[[Base64]] -uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" - -[[Dates]] -deps = ["Printf"] -uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" - -[[Distributed]] -deps = ["Random", "Serialization", "Sockets"] -uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" - -[[DocStringExtensions]] -deps = ["LibGit2", "Markdown", "Pkg", "Test"] -git-tree-sha1 = "0513f1a8991e9d83255e0140aace0d0fc4486600" -uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" -version = "0.8.0" - -[[Documenter]] -deps = ["Base64", "DocStringExtensions", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"] -git-tree-sha1 = "1b6ae3796f60311e39cd1770566140d2c056e87f" -uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -version = "0.23.3" - -[[InteractiveUtils]] -deps = ["Markdown"] -uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" - -[[JSON]] -deps = ["Dates", "Mmap", "Parsers", "Unicode"] -git-tree-sha1 = "b34d7cef7b337321e97d22242c3c2b91f476748e" -uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" -version = "0.21.0" - -[[LibGit2]] -uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" - -[[Logging]] -uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" - -[[Markdown]] -deps = ["Base64"] -uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" - -[[Mmap]] -uuid = "a63ad114-7e13-5084-954f-fe012c677804" - -[[Parsers]] -deps = ["Dates", "Test"] -git-tree-sha1 = "ef0af6c8601db18c282d092ccbd2f01f3f0cd70b" -uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "0.3.7" - -[[Pkg]] -deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] -uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" - -[[Printf]] -deps = ["Unicode"] -uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" - -[[REPL]] -deps = ["InteractiveUtils", "Markdown", "Sockets"] -uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" - -[[Random]] -deps = ["Serialization"] -uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" - -[[SHA]] -uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" - -[[Serialization]] -uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" - -[[Sockets]] -uuid = "6462fe0b-24de-5631-8697-dd941f90decc" - -[[Test]] -deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] -uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" - -[[UUIDs]] -deps = ["Random", "SHA"] -uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" - -[[Unicode]] -uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" diff --git a/docs/make.jl b/docs/make.jl index ac5603d..46d2d56 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -1,17 +1,28 @@ -using Documenter, nlminb +using Documenter, VegCurveFit +CI = get(ENV, "CI", nothing) == "true" -makedocs(; - modules=[nlminb], - format=Documenter.HTML(), - pages=[ - "Home" => "index.md", - ], - repo="https://kongdd/kongdd/nlminb.jl/blob/{commit}{path}#L{line}", - sitename="nlminb.jl", - authors="Dongdong Kong", - assets=String[], +# Logging.disable_logging(Logging.Warn) + +# Make the docs, without running the tests again +# We need to explicitly add all the extensions here +makedocs( + modules=[ + VegCurveFit + ], + format=Documenter.HTML( + prettyurls=CI, + ), + pages=[ + "Home" => "index.md", + ], + sitename="VegCurveFit.jl", + warnonly=true, + clean=false, ) -deploydocs(; - repo="kongdd/kongdd/nlminb.jl", +# Enable logging to console again +# Logging.disable_logging(Logging.BelowMinLevel) + +deploydocs( + repo="github.com/eco-hydro/VegCurveFit.jl.git", ) diff --git a/docs/src/index.md b/docs/src/index.md index 8bc7972..154a570 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -1,8 +1,5 @@ -# nlminb.jl +# VegCurveFit.jl -```@index -``` - -```@autodocs -Modules = [nlminb] +```docs +nlminb ``` diff --git a/src/CurveFit/CurveFit.jl b/src/CurveFit/CurveFit.jl index a83fe8a..e1e85f7 100644 --- a/src/CurveFit/CurveFit.jl +++ b/src/CurveFit/CurveFit.jl @@ -28,7 +28,7 @@ FUNCS_doubleLog = Dict( ) -function curvefits(y::AbstractArray{T,1}, t, w::::AbstractArray{T,1}, +function curvefits(y::AbstractArray{T,1}, t, w::AbstractArray{T,1}, ylu::Vector{Float64}, nptperyear::Integer, dt; methods=["AG", "Zhang", "Beck", "Elmore"]) where {T<:Real} diff --git a/test/runtests.jl b/test/runtests.jl index 58c2b8c..ada4b1d 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,7 +1,7 @@ -using nlminb using Test +using VegCurveFit -@testset "nlminb.jl" begin +@testset "nlminb" begin # Write your own tests here. start = [0.0] # [1, 2, 3, 4] lower = [-4.0] @@ -12,5 +12,6 @@ using Test end f(x) = x[1] - cos(x[1]) - r = optim_nlminb(start, f, verbose=false) + r = nlminb(start, f, verbose=false) + @test r["par"][1] == -1.5701006351106073 end