From 4728959ae049f728c204e206236865427bad762c Mon Sep 17 00:00:00 2001 From: Aaron Fenyes Date: Wed, 17 Jul 2024 17:22:33 -0700 Subject: [PATCH] Give spheres positive radii in examples This changes the meaning of `indep_val` in the overlapping pyramids example, so we adjust `indep_val` to get a nice-looking construction. --- engine-proto/ConstructionViewer.jl | 4 ++-- engine-proto/gram-test/overlapping-pyramids.jl | 12 +++--------- engine-proto/gram-test/sphere-in-tetrahedron.jl | 6 +++--- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/engine-proto/ConstructionViewer.jl b/engine-proto/ConstructionViewer.jl index 8cfa632..0ce6a6d 100644 --- a/engine-proto/ConstructionViewer.jl +++ b/engine-proto/ConstructionViewer.jl @@ -213,8 +213,8 @@ elements = begin 1 1 -1 -1 0 1 -1 1 -1 0 1 -1 -1 1 0 - -0.5 -0.5 -0.5 -0.5 -a-1 - 0.5 0.5 0.5 0.5 -a+1 + 0.5 0.5 0.5 0.5 a+1 + -0.5 -0.5 -0.5 -0.5 a-1 ] end diff --git a/engine-proto/gram-test/overlapping-pyramids.jl b/engine-proto/gram-test/overlapping-pyramids.jl index 8edb981..757a18c 100644 --- a/engine-proto/gram-test/overlapping-pyramids.jl +++ b/engine-proto/gram-test/overlapping-pyramids.jl @@ -23,13 +23,7 @@ end gram = sparse(J, K, values) # set the independent variable -# -# using gram[6, 2] or gram[7, 1] as the independent variable seems to stall -# convergence, even if its value comes from a known solution, like -# -# gram[6, 2] = 0.9936131705272925 -# -indep_val = -9//5 +indep_val = 2//5 gram[6, 1] = BigFloat(indep_val) gram[1, 6] = gram[6, 1] @@ -43,8 +37,8 @@ guess = begin 1 1 -1 -1 0 1 -1 1 -1 0 1 -1 -1 1 0 - -0.5 -0.5 -0.5 -0.5 -a-1 - 0.5 0.5 0.5 0.5 -a+1 + 0.5 0.5 0.5 0.5 a+1 + -0.5 -0.5 -0.5 -0.5 a-1 ] + 0.2*Engine.rand_on_shell(fill(BigFloat(-1), 5)), Engine.rand_on_shell(fill(BigFloat(-1), 2)) ) diff --git a/engine-proto/gram-test/sphere-in-tetrahedron.jl b/engine-proto/gram-test/sphere-in-tetrahedron.jl index 1c0dda8..d703321 100644 --- a/engine-proto/gram-test/sphere-in-tetrahedron.jl +++ b/engine-proto/gram-test/sphere-in-tetrahedron.jl @@ -28,7 +28,7 @@ for j in 1:6 push!(values, -1/BigFloat(3)) filled = true else - push!(values, -1) + push!(values, 1) filled = true end if filled @@ -46,8 +46,8 @@ guess = hcat( 1 1 -1 -1 0 1 -1 1 -1 0 1 -1 -1 1 0 - 0 0 0 0 -1.5 - 1 1 1 1 -0.5 + 0 0 0 0 1.5 + 1 1 1 1 0.5 ] + 0.2*Engine.rand_on_shell(fill(BigFloat(-1), 5)), BigFloat[0, 0, 0, 0, 1] )