Merge pull request #265 from MIT-AI-Accelerator/gnadt

Gnadt

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        julia-version: ['1.10', '1']
+        julia-version: ['1.6', '1.10', '1']
         julia-arch: [x64]
         os: [ubuntu-latest]
     steps:
@@ -29,9 +29,9 @@ jobs:
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
       - uses: julia-actions/julia-processcoverage@v1
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
-          file: lcov.info
+          files: lcov.info
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: false
   docs:

Project.toml

@@ -57,22 +57,22 @@ DataFrames = "1"
 DelimitedFiles = "1"
 Distributions = "0.25"
 ExponentialUtilities = "1"
-Flux = "0.14"
+Flux = "0.13, 0.14"
 FluxOptTools = "0.1"
 ForwardDiff = "0.10"
 GLMNet = "0.7"
-GR = "0.73"
+GR = "0.72, 0.73"
 Geodesy = "1"
 GlobalSensitivity = "2"
-HDF5 = "0.17"
+HDF5 = "0.16, 0.17"
 Inflate = "0.1"
-Interpolations = "0.15"
+Interpolations = "0.14, 0.15"
 IterTools = "1"
 KernelFunctions = "0.10"
 LazyArtifacts = "1"
 LinearAlgebra = "1"
 MAT = "0.10"
-MLJLinearModels = "0.10"
+MLJLinearModels = "0.9, 0.10"
 NearestNeighbors = "0.4"
 Optim = "1"
 Parameters = "0.12"
@@ -87,13 +87,13 @@ SatelliteToolboxGeomagneticField = "0.1, 1"
 ShapML = "0.3"
 SpecialFunctions = "2"
 Statistics = "1"
-StatsBase = "0.34"
+StatsBase = "0.33, 0.34"
 TOML = "1"
 Test = "1"
-TestItemRunner = "1"
+TestItemRunner = "0.2, 1"
 ZipFile = "0.10"
 Zygote = "0.6"
-julia = "1.10"
+julia = "1.6"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

README.md

@@ -31,7 +31,7 @@ julia> Pkg.activate(".")
 julia> Pkg.instantiate()
 ```
 
-**NOTE:** If an artifact produces a hash mismatch error while downloading, navigate to the 
+**Note:** If an artifact produces a hash mismatch error while downloading, navigate to the 
 local `.julia/artifacts` folder and manually set the appropriate artifact folder name. For example, the `ottawa_area_maps` artifact folder name should be `eb8d8339b55fb4b9b070eda7f3aede970ab53629`. If needed, artifacts can also be downloaded directly from their online storage locations, then unzipped, renamed, and placed in the 
 local `.julia/artifacts` folder. Online storage locations (`url`) and folder names (`git-tree-sha1`) can be found in the [Artifacts.toml](Artifacts.toml) file.
 

test/test_compensation.jl

@@ -139,7 +139,9 @@ comp_params_list = [comp_params_1,
                     comp_params_3s_drop,
                     comp_params_3s_perm]
 
-comp_csv = joinpath(@__DIR__,"test_data/comp_err.csv")
+major    = VERSION.major
+minor    = VERSION.minor
+comp_csv = joinpath(@__DIR__,"test_data/comp_err_$major.$minor.csv")
 
 if generate
     comp_err = zeros(Float32,length(comp_params_list),2)
@@ -148,7 +150,7 @@ else
 end
 
 @testset "comp_train_test tests" begin
-    atol = 5f-7
+    atol = minor == 6 ? 5f-6 : 5f-7
     for (i,comp_params) in enumerate(comp_params_list)
         comp_params_ = deepcopy(comp_params)
         (err_train_1,err_test_1) = comp_train_test(comp_params,xyz,xyz,ind,ind,

test/test_data/comp_err_1.11.csv

@@ -0,0 +1,23 @@
+0.04124898,0.04124898
+0.03209956,0.03209956
+0.04124898,0.04124898
+0.041204013,0.041204013
+0.03209956,0.03209956
+0.1172441,0.1172441
+0.034966085,0.034966085
+0.032684676,0.032684676
+0.0628586,0.0628586
+0.057060566,0.057060566
+0.15690468,0.15690468
+0.1285186,0.1285186
+0.0536842,0.0536842
+0.0536842,0.0536842
+0.0037160898,0.0037160898
+0.0025799086,0.0025799086
+0.601789,0.601789
+0.03944594,0.03944594
+0.04124898,0.03866925
+0.03942812,0.039427787
+0.041204013,0.038621586
+0.014410977,0.014410977
+0.034966085,0.03346601

test/test_data/comp_err_1.6.csv

@@ -0,0 +1,23 @@
+0.03104167,0.03104167
+0.020212658,0.020212658
+0.03104167,0.03104167
+0.030610468,0.030610468
+0.020212658,0.020212658
+0.06704217,0.06704217
+0.07086522,0.07086522
+0.068781,0.068781
+0.10427802,0.10427802
+0.11782514,0.11782514
+0.17035957,0.17035957
+0.049593963,0.049593963
+0.0536842,0.0536842
+0.0536842,0.0536842
+0.0037160898,0.0037160898
+0.0025799086,0.0025799086
+0.601789,0.601789
+0.017837923,0.017837923
+0.03104167,0.031093167
+0.01772931,0.017714206
+0.030610468,0.030695587
+0.011587158,0.011754112
+0.07086522,0.06534035

test/test_data/comp_err_1.7.csv

@@ -0,0 +1,23 @@
+0.04124898,0.04124898
+0.03209956,0.03209956
+0.04124898,0.04124898
+0.041204013,0.041204013
+0.03209956,0.03209956
+0.1172441,0.1172441
+0.034966085,0.034966085
+0.032684676,0.032684676
+0.0628586,0.0628586
+0.057060566,0.057060566
+0.15690468,0.15690468
+0.1285186,0.1285186
+0.0536842,0.0536842
+0.0536842,0.0536842
+0.0037160898,0.0037160898
+0.0025799086,0.0025799086
+0.601789,0.601789
+0.03944594,0.03944594
+0.04124898,0.03866925
+0.03942812,0.039427787
+0.041204013,0.038621586
+0.014410977,0.014410977
+0.034966085,0.03346601

test/test_data/comp_err_1.8.csv

@@ -0,0 +1,23 @@
+0.04124898,0.04124898
+0.03209956,0.03209956
+0.04124898,0.04124898
+0.041204013,0.041204013
+0.03209956,0.03209956
+0.1172441,0.1172441
+0.034966085,0.034966085
+0.032684676,0.032684676
+0.0628586,0.0628586
+0.057060566,0.057060566
+0.15690468,0.15690468
+0.1285186,0.1285186
+0.0536842,0.0536842
+0.0536842,0.0536842
+0.0037160898,0.0037160898
+0.0025799086,0.0025799086
+0.601789,0.601789
+0.03944594,0.03944594
+0.04124898,0.03866925
+0.03942812,0.039427787
+0.041204013,0.038621586
+0.014410977,0.014410977
+0.034966085,0.03346601

test/test_data/comp_err_1.9.csv

@@ -0,0 +1,23 @@
+0.04124898,0.04124898
+0.03209956,0.03209956
+0.04124898,0.04124898
+0.041204013,0.041204013
+0.03209956,0.03209956
+0.1172441,0.1172441
+0.034966085,0.034966085
+0.032684676,0.032684676
+0.0628586,0.0628586
+0.057060566,0.057060566
+0.15690468,0.15690468
+0.1285186,0.1285186
+0.0536842,0.0536842
+0.0536842,0.0536842
+0.0037160898,0.0037160898
+0.0025799086,0.0025799086
+0.601789,0.601789
+0.03944594,0.03944594
+0.04124898,0.03866925
+0.03942812,0.039427787
+0.041204013,0.038621586
+0.014410977,0.014410977
+0.034966085,0.03346601