.github/workflows/Format.yml

@@ -1,8 +1,12 @@
 name: Format suggestions
 on:
   pull_request:
+    types: [ opened, reopened, synchronize, labeled, unlabeled ]
 jobs:
   code-style:
     runs-on: ubuntu-latest
     steps:
-      - uses: julia-actions/julia-format@v2
+      - uses: julia-actions/julia-format@v3
+        with:
+          version: '1'
+          suggestion-label: 'format-suggest'

.github/workflows/CI.yml → .github/workflows/Test.yml

@@ -1,4 +1,4 @@
-name: CI
+name: Test
 on:
   push:
     branches:
@@ -14,6 +14,7 @@ jobs:
       matrix:
         version:
           - '1.6'
+          - '1.10'
           - '1'
           - 'nightly'
         os:
@@ -24,7 +25,7 @@ jobs:
           - x64
     steps:
       - uses: actions/checkout@v4
-      - uses: julia-actions/setup-julia@v1
+      - uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
@@ -41,6 +42,7 @@ jobs:
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
       - uses: julia-actions/julia-processcoverage@v1
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v5
         with:
-          file: lcov.info
+          files: lcov.info
+          token: ${{ secrets.CODECOV_TOKEN }}

Project.toml

@@ -28,13 +28,13 @@ BasicBSpline = "0.11"
 BasicBSplineExporter = "0.1"
 BasicBSplineFitting = "0.1"
 ColorBlendModes = "0.2"
-Colors = "0.12"
+Colors = "0.12, 0.13"
 FastGaussQuadrature = "0.4, 0.5, 1.0"
 FileIO = "1.11"
 ForwardDiff = "0.10"
 ImageShow = "0.3"
 IntervalSets = "0.7"
-Luxor = "2.17, 3.0"
+Luxor = "2.17, 3.0, 4.0"
 OffsetArrays = "1.10"
 StaticArrays = "1.2"
 julia = "^1.6"

README.md

@@ -1,5 +1,6 @@
 # Elastic Surface Embedding; Weaving Parer Strips
 
+[![Stable](https://img.shields.io/badge/docs-stable-blue.svg)](https://hyrodium.github.io/ElasticSurfaceEmbedding.jl/stable)
 [![Dev](https://img.shields.io/badge/docs-dev-blue.svg)](https://hyrodium.github.io/ElasticSurfaceEmbedding.jl/dev)
 [![Build Status](https://github.com/hyrodium/ElasticSurfaceEmbedding.jl/workflows/CI/badge.svg)](https://github.com/hyrodium/ElasticSurfaceEmbedding.jl/actions)
 [![Coverage](https://codecov.io/gh/hyrodium/ElasticSurfaceEmbedding.jl/branch/main/graph/badge.svg)](https://codecov.io/gh/hyrodium/ElasticSurfaceEmbedding.jl)
@@ -29,7 +30,7 @@ This is the meaning of "Elastic Surface Embedding".
 The definition must consist of parametric mapping and its domain.
 For example, a paraboloid can be parametrized as below.
 
-$$
+```math
 \begin{aligned}
 \boldsymbol{p}_{[0]}(u^1,u^2)
 &= \begin{pmatrix}
@@ -40,16 +41,16 @@ u^2 \\
 (u^1, u^2)
 \in [-1,1] \times [-1,1]
 \end{aligned}
-$$
+```
 
 The domain will be split into $D^{(i)}$.
 
-$$
+```math
 \begin{aligned}
 D^{(i)}
 = [-1,1] \times \left[\frac{i-1}{10}, \frac{i}{10}\right] \qquad (i = 1,...,10)
 \end{aligned}
-$$
+```
 
 ### step 2: Numerical analysis
 This is the main part.

docs/gallery/weaving_examples/helicatenoid.jl

@@ -73,3 +73,7 @@ export_pinned_steps("helicatenoid-b", steptree, unitlength=(40,"mm"), mesh=(36,1
 # ![](helicatenoid-b/pinned/pinned-9.svg) ![](helicatenoid-b/pinned/pinned-18.svg) ![](helicatenoid-b/pinned/pinned-27.svg)
 # ![](helicatenoid-b/pinned/pinned-36.svg) ![](helicatenoid-b/pinned/pinned-45.svg) ![](helicatenoid-b/pinned/pinned-54.svg)
 # ![](helicatenoid-b/pinned/pinned-63.svg) ![](helicatenoid-b/pinned/pinned-72.svg) ![](helicatenoid-b/pinned/pinned-81.svg)
+
+# # References
+# - [Isometric transformation between a Catenoid and a Helicoid](https://www.youtube.com/watch?v=Gp6XkPLCw7s)
+# - [2019 Joint Mathematics Meetings - Yuto Horikawa](https://gallery.bridgesmathart.org/exhibitions/2019-joint-mathematics-meetings/yuto-horikawa)

docs/gallery/weaving_examples/helicatenoid2.jl

@@ -1,9 +1,13 @@
 # ---
 # title: Helicatenoid2
+# cover: ../assets/helicatenoid2.jpg
 # description: Weaving a transformable curved surface from catenoid to helicoid (2).
 # ---
 
 # Weaving a transformable curved surface from catenoid to helicoid.
+# You can buy the kit [via my Booth site](https://hyrodium.booth.pm/items/5046306)!
+
+# ![](../assets/helicatenoid2.jpg)
 
 # ## Load packages
 using Luxor
@@ -127,3 +131,6 @@ end
 # ![](helicatenoid2/embedding-2.svg)
 # ![](helicatenoid2/embedding-3.svg)
 # ![](helicatenoid2/embedding-4.svg)
+
+# # References
+# - [懸垂面螺旋面製作キット](https://hackmd.io/@hyrodium/Hy4D5r633)

docs/gallery/weaving_examples/stereographicprojection.jl

@@ -5,6 +5,7 @@
 # ---
 
 # A point light illuminates the grid points on the ground.
+# You can buy the kit [via my Booth site](https://hyrodium.booth.pm/items/5046218)!
 
 # ![](../assets/stereographicprojection.jpg)
 
@@ -130,7 +131,7 @@ end
 # Please check the following references for more information.
 
 # # References
-# * [紙工作で立体射影をつくった話](https://note.com/hyrodium/n/n7b7cf03a7d91)
-# * [立体射影製作キット](https://hackmd.io/@hyrodium/HJsIPNKqo)
-# * [Stereographic projection weaving kit](https://hackmd.io/@hyrodium/H1epn1rRj)
-# * [Further adventures in stereographic projection](https://www.youtube.com/watch?v=lbUOScpu0ws)
+# - [紙工作で立体射影をつくった話](https://note.com/hyrodium/n/n7b7cf03a7d91)
+# - [立体射影製作キット](https://hackmd.io/@hyrodium/HJsIPNKqo)
+# - [Stereographic projection weaving kit](https://hackmd.io/@hyrodium/H1epn1rRj)
+# - [Further adventures in stereographic projection](https://www.youtube.com/watch?v=lbUOScpu0ws)

docs/make.jl

@@ -17,7 +17,7 @@ makedocs(;
     format = Documenter.HTML(;
         prettyurls = true,
         canonical = "https://hyrodium.github.io/ElasticSurfaceEmbedding.jl",
-        assets = ["assets/custom.css", gallery_assets],
+        assets = ["assets/favicon.ico", "assets/custom.css", gallery_assets],
         repolink = "https://github.com/hyrodium/ElasticSurfaceEmbedding.jl"
     ),
     pages = [

docs/src/craft.md

@@ -8,10 +8,17 @@ You can:
     * I'm using [Beambox by FLUX.inc](https://flux3dp.com/beambox/).
 * [Compute the shape of paper strip](@ref numerical_computation), instead of downloading the paraboloid.
     * This needs setup for Julia environment.
-* Buy already cut pieces of paper at [Booth](https://hyrodium.booth.pm/) (In preparation).
-    * Ships from Japan.
+* Buy already cut pieces of paper from [my Booth page](https://hyrodium.booth.pm/).
+    * [懸垂面↔螺旋面 変形模型製作キット](https://hyrodium.booth.pm/items/5046306)
+    * [立体射影製作キット](https://hyrodium.booth.pm/items/5046218)
 
 ## Images during the making process
 
 ![](img/assembling.png)
 ![](img/craft.png)
+
+See also
+
+- [立体射影製作キット](https://hackmd.io/@hyrodium/HJsIPNKqo)
+- [Stereographic projection weaving kit](https://hackmd.io/@hyrodium/H1epn1rRj)
+- [懸垂面螺旋面製作キット](https://hackmd.io/@hyrodium/Hy4D5r633)

docs/src/run-julia.md

@@ -6,8 +6,8 @@ On Julia's package mode, run the following commands.
 pkg> add IntervalSets
 pkg> add StaticArrays
 pkg> add BasicBSpline
-pkg> add https://github.com/hyrodium/BasicBSplineExporter.jl
-pkg> add https://github.com/hyrodium/ElasticSurfaceEmbedding.jl
+pkg> add BasicBSplineExporter.jl
+pkg> add ElasticSurfaceEmbedding.jl
 ```
 
 ## Overview of our method

src/_bspline.jl

@@ -95,7 +95,7 @@ function suggest_knotvector(steptree; index=0)
 end
 
 """
-    show_knotvector(; index=0)
+    show_knotvector(::StepTree; index=0)
 
 Show current knotvector and suggestions for knot insertions (with given index).
 """
@@ -107,10 +107,10 @@ function show_knotvector(steptree; index = 0)
     k₁₊, k₂₊ = suggest_knotvector(steptree, index=index)
     msg = """
     Current knotvectors (k₁, k₂) and suggestions for knot insertions (k₁₊, k₂₊)
-    k₁: , $(BasicBSpline._vec(k₁))
-    k₂: , $(BasicBSpline._vec(k₂))
-    k₁₊: , $(BasicBSpline._vec(k₁₊))
-    k₂₊: , $(BasicBSpline._vec(k₂₊))
+    k₁: $(BasicBSpline._vec(k₁))
+    k₂: $(BasicBSpline._vec(k₂))
+    k₁₊: $(BasicBSpline._vec(k₁₊))
+    k₂₊: $(BasicBSpline._vec(k₂₊))
     """
     @info msg
     return

test/runtests.jl

@@ -31,15 +31,38 @@ function delta(f, B)
     return maximum(f.(xs)) - minimum(f.(xs))
 end
 
-dir_result = joinpath(@__DIR__, "result")
-
-rm(dir_result, recursive = true, force = true)
+DIR_RESULT = joinpath(@__DIR__, "result")
+
+rm(DIR_RESULT, recursive = true, force = true)
+
+@testset "README example" begin
+    # Overload the shape definition
+    ElasticSurfaceEmbedding.surface(x,y) = SVector(x, y, x^2+y^2)
+    # (1) split the surface into strips
+    dom = [(-1..1, (i-1)/10..i/10) for i in 1:10]
+    # (2) Embed the strips onto a plane
+    res = auto_allsteps(dom)
+    export_pinned_steps(joinpath(DIR_RESULT, "paraboloid"), res)
+
+    @test isfile(joinpath(DIR_RESULT, "paraboloid", "pinned", "pinned-7.svg"))
+    @test isfile(joinpath(DIR_RESULT, "paraboloid", "pinned", "pinned-14.svg"))
+    @test isfile(joinpath(DIR_RESULT, "paraboloid", "pinned", "pinned-21.svg"))
+    @test isfile(joinpath(DIR_RESULT, "paraboloid", "pinned", "pinned-28.svg"))
+    @test isfile(joinpath(DIR_RESULT, "paraboloid", "pinned", "pinned-35.svg"))
+    @test isfile(joinpath(DIR_RESULT, "paraboloid", "pinned", "pinned-42.svg"))
+    @test isfile(joinpath(DIR_RESULT, "paraboloid", "pinned", "pinned-49.svg"))
+    @test isfile(joinpath(DIR_RESULT, "paraboloid", "pinned", "pinned-56.svg"))
+    @test isfile(joinpath(DIR_RESULT, "paraboloid", "pinned", "pinned-63.svg"))
+    @test isfile(joinpath(DIR_RESULT, "paraboloid", "pinned", "pinned-70.svg"))
+end
 
 @testset "Rhomboid" begin
     ElasticSurfaceEmbedding.𝒑₍₀₎(u¹, u²) = SVector(u¹, u², u¹ + u²)
     D = (-1.0 .. 1.0, -1.0 .. 1.0)
     show_strain(D)
     @test_logs (:info, "Strain - domain: [-1.0, 1.0]×[-1.0, 1.0]\nPredicted: (min: -0.0, max: 0.0)\n") show_strain(D)
+    @test_logs (:info, "Strain - domain: [-1.0, 1.0]×[-1.0, 1.0]\n  Predicted: (min: -0.0, max: 0.0)\n") show_strain([D])
+    @test_logs (:info, "Strain - domain: [-1.0, 1.0]×[-1.0, 1.0]\n  Predicted: (min: -0.0, max: 0.0)\nStrain - domain: [-1.0, 1.0]×[-1.0, 1.0]\n  Predicted: (min: -0.0, max: 0.0)\n") show_strain([D,D])
 
     result = initial_state(D)
     M = ElasticSurfaceEmbedding.loadM(result)
@@ -57,6 +80,19 @@ rm(dir_result, recursive = true, force = true)
     @test 𝒂[M, n] ≈ [√(3 / 2), 1 / √(2)]
     @test 𝒂[M, N] ≈ [√(3 / 2), 3 / √(2)]
 
+    P₁, _ = result.steps[end].manifold.bsplinespaces
+    k₁ = knotvector(P₁)
+    @test k₁.vector ≈ [-1,-1,-1,-1,0,1,1,1,1]
+    k₁₊, _ = suggest_knotvector(result, index=1)
+    msg = """
+    Current knotvectors (k₁, k₂) and suggestions for knot insertions (k₁₊, k₂₊)
+    k₁: $(BasicBSpline._vec(k₁))
+    k₂: $([-1.0, -1.0, -1.0, 1.0, 1.0, 1.0])
+    k₁₊: $(BasicBSpline._vec(k₁₊))
+    k₂₊: $([0.0])
+    """
+    @test_logs (:info, msg) show_knotvector(result)
+
     newton_onestep!(result)
     M = ElasticSurfaceEmbedding.loadM(result)
     𝒂 = controlpoints(M)
@@ -216,12 +252,12 @@ end
         pin!(result)
     end
 
-    export_all_steps(joinpath(dir_result, "Paraboloid"), result)
-    files_pinned = readdir(joinpath(dir_result, "Paraboloid", "pinned"))
+    export_all_steps(joinpath(DIR_RESULT, "Paraboloid"), result)
+    files_pinned = readdir(joinpath(DIR_RESULT, "Paraboloid", "pinned"))
 
     @test length(files_pinned) == N
 
-    # img_b = load(joinpath(dir_result,"Paraboloid","append","Paraboloid-5_append.png"))
+    # img_b = load(joinpath(DIR_RESULT,"Paraboloid","append","Paraboloid-5_append.png"))
     # d = Euclidean()
     # @test d(RGB.(img_a), RGB.(img_b)) < 0.0001
 end