Refactoring / rewriting

.gitignore

@@ -1,9 +1,12 @@
+# Editors
+.vscode
+
 # Files generated by invoking Julia with --code-coverage
 *.jl.cov
 *.jl.*.cov
 
 *.obj
-
+examples/**.png
 
 # Files generated by invoking Julia with --track-allocation
 *.jl.mem
@@ -25,3 +28,14 @@ docs/site/
 # committed for packages, but should be committed for applications that require a static
 # environment.
 Manifest.toml
+
+# Misc.
+*.tmp
+*.temp
+
+*sync-conflict*
+src/debug_script.jl
+examples/personal
+examples/*.png
+
+

.gitignore.orig

@@ -0,0 +1,54 @@
+# Editors
+.vscode
+
+# Files generated by invoking Julia with --code-coverage
+*.jl.cov
+*.jl.*.cov
+
+*.obj
+it*.png
+loss*.png
+change*.png
+delta*.png
+error*.png
+img*.png
+orig*.png
+
+
+# Files generated by invoking Julia with --track-allocation
+*.jl.mem
+
+# System-specific files and directories generated by the BinaryProvider and BinDeps packages
+# They contain absolute paths specific to the host computer, and so should not be committed
+deps/deps.jl
+deps/build.log
+deps/downloads/
+deps/usr/
+deps/src/
+
+# Build artifacts for creating documentation generated by the Documenter package
+docs/build*
+docs/site/
+
+# File generated by Pkg, the package manager, based on a corresponding Project.toml
+# It records a fixed state of all packages used by the project. As such, it should not be
+# committed for packages, but should be committed for applications that require a static
+# environment.
+Manifest.toml
+
+# Misc.
+*.tmp
+*.temp
+
+*sync-conflict*
+src/debug_script.jl
+examples/personal
+examples/*.png
+
+
+<<<<<<< HEAD
+
+src/debug_script.jl
+examples/personal
+=======
+>>>>>>> 9473c949cf07d0e9431c75b57947a2304ac33a97

Project.toml

@@ -1,15 +1,30 @@
 name = "CausticsEngineering"
 uuid = "e17b973c-3eae-4e30-9cf2-ee583e3dfd43"
 authors = ["Matt Ferraro", "Emmanuel Rialland"]
-version = "0.1.0"
+version = "0.2.0"
 
 [deps]
+CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
+Debugger = "31a5f54b-26ea-5ae9-a837-f05ce5417438"
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 DocumenterTools = "35a29f4d-8980-5a13-9543-d66fff28ecb8"
+FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
+GLMakie = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a"
+GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
 Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0"
 JuliaFormatter = "98e50ef6-434e-11e9-1051-2b60c6c9e899"
+LibGit2 = "76f85450-5226-5b5a-8eaa-529ad045b433"
+MeshIO = "7269a6da-0436-5bbc-96c2-40638cbb6118"
+MeshViz = "9ecf9c4f-6e5a-4b5e-83ae-06f2c7a661d8"
+Meshes = "eacbb407-ea5a-433e-ab97-5258b1ca43fa"
+OhMyREPL = "5fb14364-9ced-5910-84b2-373655c76a03"
+PkgTemplates = "14b8a8f1-9102-5b29-a752-f990bacb7fe1"
+Plotly = "58dd65bb-95f3-509e-9936-c39a10fdeae7"
 Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
+Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+Revise = "295af30f-e4ad-537b-8983-00126c2a3abe"
+Weave = "44d3d7a6-8a23-5bf8-98c5-b353f8df5ec9"
 
 [compat]
 julia = "1"

docs/make.jl

@@ -1,7 +1,7 @@
 push!(LOAD_PATH, "../src/")
 
 using CausticsEngineering
-using Documenter
+using Documenter, DocStringExtensions
 
 #
 # HTML docs

run.jl

@@ -1,7 +1,21 @@
+# Work in a temporary environment
 using Pkg
-Pkg.activate(".")
+Pkg.activate(; temp = true)
 
-using Images, CausticsEngineering
+# Speed up by avoiding updating the repository when adding packages
+Pkg.UPDATED_REGISTRY_THIS_SESSION[] = true
 
-image = Images.load("./examples/cat_posing.jpg") # Check current working directory with pwd()
+# Add useful package
+Pkg.add([
+    "Revise", "Images"
+])
+
+Pkg.develop(path = @__DIR__)
+
+using Revise, Images
+
+using CausticsEngineering
+
+# Check current working directory with pwd()
+image = Images.load("./examples/personal/caricature.jpg")
 engineer_caustics(image);

src/CausticsEngineering.jl

@@ -1,13 +1,71 @@
 module CausticsEngineering
 
 using DocStringExtensions
+using Random, Images
 
-using Images, Plots
+using Plots
 gr()
 
+using Meshes, FileIO, MeshIO
+
+
+include("../examples/personal/original.jl")
+
+
+include("parameters.jl")
 include("utilities.jl")
+include("math_utilities.jl")
+include("mesh.jl")
+include("io.jl")
+include("plots.jl")
+
 include("create_mesh.jl")
 
-export main, engineer_caustics
 
+
+"""
+$(SIGNATURES)
+"""
+function main()
+    @assert size(ARGS) == (1,) "Intented usage is: julia create_mesh.jl image.png"
+
+    img = Images.load(ARGS[1])
+    return engineer_caustics(img)
 end
+
+export
+    # Constants
+    Meters_Per_Pixel,
+    Bottom_Offset,
+    Top_Offset,
+
+    # Types
+    Vertex3D,
+    FieldVertex3D,
+    FaceMesh,
+
+    # math
+    average,
+    average_absolute,
+    laplacian,
+    ∇,
+
+    # Mesh
+    create_solid,
+    create_solid_as_dict,
+    get_lens_pixels_area,
+
+    # Plotting
+    plot_as_quiver,
+
+    # I/O
+    save_obj!,
+
+    # Main procedures
+    propagate_poisson!,
+    march_mesh!,
+    engineer_caustics,
+    main
+
+
+end # End module