Update environment

Author: juliohm

05-transforms.qmd

@@ -198,14 +198,6 @@ gtb |> Map([2, 3] => ((b, c) -> 2b + c) => "f(b, c)")
 The name of the resulting column can be provided or omitted. If the name is omitted like in the
 example above with the column "a", it is created by concatenation of column and function names.
 
-::: {.callout-note}
-
-The `Map` transform mimics the behavior of the `transform` function in DataFrames.jl, except
-that it always broadcasts the functions to the rows of the selected columns and always produces
-a single column for each function.
-
-::: 
-
 To filter rows in the geotable based on a given predicate (i.e., a function that returns
 `true` or `false`), we can use the `Filter` transform:
 

12-mining.qmd

@@ -390,15 +390,15 @@ f(Cu) = 1 / (1 + exp(-(Cu - μ) / σ))
 ```
 
 ```{julia}
-estim = estim |> Map("Cu" => f => "f")
+recov = estim |> Map("Cu" => f => "f")
 ```
 
 Please check the paper by @Hoffimann2022_2 for a more elaborate model of metallurgical
 recovery in the locked-cycle-test.
 
 ### Economic assessment
 
-Given the block model with the grade of copper and metallurgical recovery, we can proceed
+Given the grade of copper and metallurgical recovery for each block, we can proceed
 and apply the formula of economic value stated in our [objectives](#objectives):
 
 ```{julia}
@@ -409,22 +409,30 @@ P = 4000 / ton
 Cₘ = 4 / ton
 Cₚ = 10 / ton
 
-estim = @transform(estim,
+model = @transform([estim recov],
   :value = volume(:geometry) * ρ * ((:Cu / 100) * :f * P - (Cₘ + Cₚ))
 )
 ```
 
+::: {.callout-tip}
+
+The expression `[estim recov]` concatenates the columns of the
+two geotables assuming that they share the same geospatial domain.
+It is equivalent to `hcat(estim, recov)`.
+
+:::
+
 We can then visualize all blocks with a positive economic value:
 
 ```{julia}
-estim |> Filter(x -> x.value > 0) |> Select("value") |> viewer
+model |> Filter(x -> x.value > 0) |> Select("value") |> viewer
 ```
 
 Or any criterion of interest such as positive economic value and
 small fraction of contaminants:
 
 ```{julia}
-estim |> Filter(x -> x.value > 0 && x.S < 0.25) |> Select("value") |> viewer
+model |> Filter(x -> x.value > 0 && x.S < 0.25) |> Select("value") |> viewer
 ```
 
 ## Summary

Manifest.toml

@@ -286,9 +286,9 @@ version = "1.1.1"
 
 [[deps.CairoMakie]]
 deps = ["CRC32c", "Cairo", "Cairo_jll", "Colors", "FileIO", "FreeType", "GeometryBasics", "LinearAlgebra", "Makie", "PrecompileTools"]
-git-tree-sha1 = "22c63a303e8d6ff1a02a0933d579dbdb6e0f2925"
+git-tree-sha1 = "ed19d39c31fdce671fb25d20f357618c495bd225"
 uuid = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
-version = "0.15.4"
+version = "0.15.5"
 
 [[deps.Cairo_jll]]
 deps = ["Artifacts", "Bzip2_jll", "CompilerSupportLibraries_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "JLLWrappers", "LZO_jll", "Libdl", "Pixman_jll", "Xorg_libXext_jll", "Xorg_libXrender_jll", "Zlib_jll", "libpng_jll"]
@@ -506,9 +506,9 @@ weakdeps = ["InverseFunctions"]
 
 [[deps.ComputePipeline]]
 deps = ["Observables", "Preferences"]
-git-tree-sha1 = "e215ba0e9a9e9377f2ed87cf3eb26840c8990585"
+git-tree-sha1 = "cb1299fee09da21e65ec88c1ff3a259f8d0b5802"
 uuid = "95dc2771-c249-4cd0-9c9f-1f3b4330693c"
-version = "0.1.3"
+version = "0.1.4"
 
 [[deps.ConcurrentUtilities]]
 deps = ["Serialization", "Sockets"]
@@ -1058,9 +1058,9 @@ version = "0.3.0"
 
 [[deps.GeoStats]]
 deps = ["CategoricalArrays", "Chain", "CoDa", "Colors", "CoordGridTransforms", "CoordRefSystems", "DataScienceTraits", "Dates", "DensityRatioEstimation", "Distances", "GeoStatsBase", "GeoStatsFunctions", "GeoStatsModels", "GeoStatsProcesses", "GeoStatsTransforms", "GeoStatsValidation", "GeoTables", "LossFunctions", "Meshes", "Reexport", "Rotations", "Statistics", "StatsLearnModels", "TableTransforms", "Tables", "Unitful"]
-git-tree-sha1 = "bd7c85de892c287fab6efaed34c42dc25437594d"
+git-tree-sha1 = "86abda50b1e7fe06f2fc3fa5a23c6bbcdde902c8"
 uuid = "dcc97b0b-8ce5-5539-9008-bb190f959ef6"
-version = "0.81.5"
+version = "0.81.6"
 
 [[deps.GeoStatsBase]]
 deps = ["CategoricalArrays", "ColumnSelectors", "DataScienceTraits", "DensityRatioEstimation", "Distances", "Distributions", "GeoTables", "LinearAlgebra", "Meshes", "Optim", "Rotations", "StaticArrays", "StatsBase", "Tables", "TypedTables", "Unitful"]
@@ -1712,9 +1712,9 @@ version = "0.5.16"
 
 [[deps.Makie]]
 deps = ["Animations", "Base64", "CRC32c", "ColorBrewer", "ColorSchemes", "ColorTypes", "Colors", "ComputePipeline", "Contour", "Dates", "DelaunayTriangulation", "Distributions", "DocStringExtensions", "Downloads", "FFMPEG_jll", "FileIO", "FilePaths", "FixedPointNumbers", "Format", "FreeType", "FreeTypeAbstraction", "GeometryBasics", "GridLayoutBase", "ImageBase", "ImageIO", "InteractiveUtils", "Interpolations", "IntervalSets", "InverseFunctions", "Isoband", "KernelDensity", "LaTeXStrings", "LinearAlgebra", "MacroTools", "Markdown", "MathTeXEngine", "Observables", "OffsetArrays", "PNGFiles", "Packing", "Pkg", "PlotUtils", "PolygonOps", "PrecompileTools", "Printf", "REPL", "Random", "RelocatableFolders", "Scratch", "ShaderAbstractions", "Showoff", "SignedDistanceFields", "SparseArrays", "Statistics", "StatsBase", "StatsFuns", "StructArrays", "TriplotBase", "UnicodeFun", "Unitful"]
-git-tree-sha1 = "96d73e05b6f3079df0963b66c2844d162263a896"
+git-tree-sha1 = "c2dbe9f2b1360edb15d4f711e6cc3ca0cad1acde"
 uuid = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
-version = "0.24.4"
+version = "0.24.5"
 
 [[deps.MappedArrays]]
 git-tree-sha1 = "2dab0221fe2b0f2cb6754eaa743cc266339f527e"
@@ -2497,9 +2497,9 @@ weakdeps = ["MLJModelInterface"]
 
 [[deps.StatsModels]]
 deps = ["DataAPI", "DataStructures", "LinearAlgebra", "Printf", "REPL", "ShiftedArrays", "SparseArrays", "StatsAPI", "StatsBase", "StatsFuns", "Tables"]
-git-tree-sha1 = "9022bcaa2fc1d484f1326eaa4db8db543ca8c66d"
+git-tree-sha1 = "728d276a5adc2f1cbb800eec4b63d0a8221024b4"
 uuid = "3eaba693-59b7-5ba5-a881-562e759f1c8d"
-version = "0.7.4"
+version = "0.7.5"
 
 [[deps.StringManipulation]]
 deps = ["PrecompileTools"]
@@ -2572,9 +2572,9 @@ version = "1.0.1"
 
 [[deps.TableTransforms]]
 deps = ["AbstractTrees", "CategoricalArrays", "CoDa", "ColumnSelectors", "DataScienceTraits", "Distributed", "Distributions", "InverseFunctions", "LinearAlgebra", "NelderMead", "PrettyTables", "Random", "SpectralIndices", "Statistics", "StatsBase", "TableDistances", "Tables", "TransformsBase", "Unitful"]
-git-tree-sha1 = "03dccc4cb574eaa115bd797a89c5d72a78b131ea"
+git-tree-sha1 = "015f7c269d80b9bdaa316967ea6543d6325db328"
 uuid = "0d432bfd-3ee1-4ac1-886a-39f05cc69a3e"
-version = "1.36.2"
+version = "1.37.1"
 
 [[deps.Tables]]
 deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "OrderedCollections", "TableTraits"]

preface.qmd

@@ -115,13 +115,13 @@ using Pkg
 pkg"activate @GDSJL"
 
 # install framework
-pkg"add GeoStats@0.81.5"
+pkg"add GeoStats@0.81.6"
 
 # install IO module
 pkg"add GeoIO@1.20.7"
 
 # install viz modules
-pkg"add CairoMakie@0.15.4"
+pkg"add CairoMakie@0.15.5"
 pkg"add PairPlots@3.0.2"
 
 # install other modules