diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index f104c87..3b1d808 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -26,9 +26,9 @@ jobs: - macOS-latest - windows-latest arch: - - x86 + # - x86 - x64 - - aarch64 + # - aarch64 steps: - uses: actions/checkout@v2 - uses: julia-actions/setup-julia@v1 diff --git a/src/constructors.jl b/src/constructors.jl index cf83304..b02562e 100644 --- a/src/constructors.jl +++ b/src/constructors.jl @@ -15,7 +15,7 @@ The function Settings() will create a set of settings for the train run calculat # Example ```jldoctest julia> my_settings = Settings() # will generate default settings -Settings(mass_point, :distance, 20, 3, running_time, julia_dict, ".") +Settings(mass_point, :distance, 20, 3, running_time, :dataframe) ``` """ function Settings(file="DEFAULT") diff --git a/test/runtests.jl b/test/runtests.jl index af73926..f97be1f 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -14,25 +14,25 @@ settings = Dict() @testset "load data" begin println("testing load train data") - push!(trains, :freight => @time Train("test/data/trains/freight.yaml")) - push!(trains, :local => @time Train("test/data/trains/local.yaml")) - push!(trains, :longdistance => @time Train("test/data/trains/longdistance.yaml")) + push!(trains, :freight => @time Train("data/trains/freight.yaml")) + push!(trains, :local => @time Train("data/trains/local.yaml")) + push!(trains, :longdistance => @time Train("data/trains/longdistance.yaml")) println("testing load path data") - push!(paths, :const => @time Path("test/data/paths/const.yaml")) - push!(paths, :slope => @time Path("test/data/paths/slope.yaml")) - push!(paths, :speed => @time Path("test/data/paths/speed.yaml")) - push!(paths, :realworld => @time Path("test/data/paths/realworld.yaml")) + push!(paths, :const => @time Path("data/paths/const.yaml")) + push!(paths, :slope => @time Path("data/paths/slope.yaml")) + push!(paths, :speed => @time Path("data/paths/speed.yaml")) + push!(paths, :realworld => @time Path("data/paths/realworld.yaml")) println("testing load settings data") push!(settings, "default" => @time Settings()) - push!(settings, "poi" => @time Settings("test/data/settings/points_of_interest.yaml")) - push!(settings, "drivingcourse" => @time Settings("test/data/settings/driving_course.yaml")) - push!(settings, "everything" => @time Settings("test/data/settings/everything.yaml")) - push!(settings, "strip" => @time Settings("test/data/settings/strip.yaml")) - push!(settings, "time" => @time Settings("test/data/settings/time.yaml")) - push!(settings, "timestrip" => @time Settings("test/data/settings/time_strip.yaml")) - push!(settings, "velocity" => @time Settings("test/data/settings/velocity.yaml")) + push!(settings, "poi" => @time Settings("data/settings/points_of_interest.yaml")) + push!(settings, "drivingcourse" => @time Settings("data/settings/driving_course.yaml")) + push!(settings, "everything" => @time Settings("data/settings/everything.yaml")) + push!(settings, "strip" => @time Settings("data/settings/strip.yaml")) + push!(settings, "time" => @time Settings("data/settings/time.yaml")) + push!(settings, "timestrip" => @time Settings("data/settings/time_strip.yaml")) + push!(settings, "velocity" => @time Settings("data/settings/velocity.yaml")) @test typeof(first(paths)[2]) == Path @test typeof(first(settings)[2]) == Settings