upds

Author: FraCpl

src/JTools.jl

@@ -62,7 +62,7 @@ include("functions/psd.jl")
 export rcsMixMatrix, rcsAllocation, rcsAnalysis, rcsEnvelope, plotRcs, plotRcs!, rcsAllocationSimplex
 include("functions/rcsTools.jl")
 
-export mesh2obj, ObjModel, readObj, writeObj
+export mesh2obj, ObjModel, readObj, writeObj, grid2mesh
 include("functions/obj.jl")
 
 export includedir

src/functions/lsq.jl

@@ -7,7 +7,7 @@ multivariate function f(x) = [f₁(x); f₂(x); ...; fₙ(x)].
 
 minₓ: J = fᵀ(x) W f(x)
 
-NB: usually in estimation problems f(x) = y - h(x), where y are stacked noisy measurements
+NB: usually in estimation problems f(x) = h(x) - y, where y are stacked noisy measurements
 and h(x) is the nonlinear measurement model.
 
 Inputs:

src/functions/obj.jl

@@ -1,14 +1,33 @@
-function mesh2obj(m, outfile)
+function mesh2obj(m, outfile, flipNormal=false)
     open(outfile, write=true) do io
         for v in coordinates(m)
             write(io, "v $(join(v, " "))\n")
         end
-        for f in faces(m)
-            write(io, "f $(join(f, " "))\n")
+        if flipNormal
+            for f in faces(m)
+                write(io, "f $(join(f[[1, 3, 2]], " "))\n")
+            end
+        else
+            for f in faces(m)
+                write(io, "f $(join(f, " "))\n")
+            end
         end
     end
 end
 
+# Pos is a matrix of 3d positions
+function grid2mesh(pos)
+    Ny, Nx = size(pos)
+    f = fill(TriangleFace([0, 0, 0]), 2(Nx - 1)*(Ny - 1))
+    q = 1
+    for j in 1:Nx-1, k in Ny*(j - 1)+1:Ny*j-1
+        f[q] = TriangleFace([k, k + 1, k + Ny + 1])
+        f[q+1] = TriangleFace([k, k + Ny + 1, k + Ny])
+        q += 2
+    end
+    return GeometryBasics.Mesh(Point3f.(pos[:]), f)
+end
+
 struct ObjModel
     faces::Vector{Vector{Int}}
     vertices::Vector{Vector{Float64}}

test/testLsq.jl

@@ -1,7 +1,7 @@
 using JTools
 using GLMakie
 
-d = collect(range(0, 6, 300))
+d = collect(range(0, 3, 100))
 xTrue = [1.3; 0.4]
 xEst0 = ones(length(xTrue))