From 8456e04f97f0536fc0145ea78f03673386115cd6 Mon Sep 17 00:00:00 2001 From: Lorenzo Paiola Date: Tue, 15 Oct 2024 19:07:26 +0200 Subject: [PATCH] prova con u non integrato --- Manifest.toml | 362 +++++------------------------------------ Project.toml | 3 - scripts/provaDiffeq.jl | 19 ++- src/fun2.jl | 6 +- 4 files changed, 51 insertions(+), 339 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index a5f858a..6e81d14 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -2,7 +2,7 @@ julia_version = "1.11.0" manifest_format = "2.0" -project_hash = "4ea7284f9f9fe6f2499b47482d16b9707b6027d9" +project_hash = "c931d84a4c49686fdaf5bb08c522217bbaf1a566" [[deps.ADTypes]] git-tree-sha1 = "eea5d80188827b35333801ef97a40c2ed653b081" @@ -158,29 +158,12 @@ version = "0.4.7" uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" version = "1.11.0" -[[deps.Bijections]] -git-tree-sha1 = "d8b0439d2be438a5f2cd68ec158fe08a7b2595b7" -uuid = "e2ed5e7c-b2de-5872-ae92-c73ca462fb04" -version = "0.1.9" - [[deps.BitTwiddlingConvenienceFunctions]] deps = ["Static"] git-tree-sha1 = "f21cfd4950cb9f0587d5067e69405ad2acd27b87" uuid = "62783981-4cbd-42fc-bca8-16325de8dc4b" version = "0.1.6" -[[deps.BlockArrays]] -deps = ["ArrayLayouts", "FillArrays", "LinearAlgebra"] -git-tree-sha1 = "d434647f798823bcae510aee0bc0401927f64391" -uuid = "8e7c35d0-a365-5155-bbbb-fb81a777f24e" -version = "1.1.1" - - [deps.BlockArrays.extensions] - BlockArraysBandedMatricesExt = "BandedMatrices" - - [deps.BlockArrays.weakdeps] - BandedMatrices = "aae01518-5342-5314-be14-df237901396f" - [[deps.Bzip2_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "9e2a6b69137e6969bab0152632dcb3bc108c8bdd" @@ -208,12 +191,6 @@ git-tree-sha1 = "e329286945d0cfc04456972ea732551869af1cfc" uuid = "4e9b3aee-d8a1-5a3d-ad8b-7d824db253f0" version = "1.0.1+0" -[[deps.CSTParser]] -deps = ["Tokenize"] -git-tree-sha1 = "0157e592151e39fa570645e2b2debcdfb8a0f112" -uuid = "00ebfdb7-1f24-5e51-bd34-a7502290713f" -version = "3.4.3" - [[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"] git-tree-sha1 = "009060c9a6168704143100f36ab08f06c2af4642" @@ -275,12 +252,6 @@ git-tree-sha1 = "08c8b6831dc00bfea825826be0bc8336fc369860" uuid = "861a8166-3701-5b0c-9a16-15d98fcdc6aa" version = "1.0.2" -[[deps.CommonMark]] -deps = ["Crayons", "PrecompileTools"] -git-tree-sha1 = "3faae67b8899797592335832fccf4b3c80bb04fa" -uuid = "a80b9123-70ca-4bc0-993e-6e3bcb318db6" -version = "0.8.15" - [[deps.CommonSolve]] git-tree-sha1 = "0eee5eb66b1cf62cd6ad1b460238e60e4b09400c" uuid = "38540f10-b2f7-11e9-35d8-d573e4eb0ff2" @@ -312,11 +283,6 @@ deps = ["Artifacts", "Libdl"] uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" version = "1.1.1+0" -[[deps.CompositeTypes]] -git-tree-sha1 = "bce26c3dab336582805503bed209faab1c279768" -uuid = "b152e2b5-7a66-4b01-a709-34e65c35f657" -version = "0.1.4" - [[deps.CompositionsBase]] git-tree-sha1 = "802bb88cd69dfd1509f6670416bd4434015693ad" uuid = "a33af91c-f02d-484b-be07-31d278c5ca2b" @@ -404,10 +370,10 @@ uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab" version = "1.9.1" [[deps.DiffEqBase]] -deps = ["ArrayInterface", "ConcreteStructs", "DataStructures", "DocStringExtensions", "EnumX", "EnzymeCore", "FastBroadcast", "FastClosures", "ForwardDiff", "FunctionWrappers", "FunctionWrappersWrappers", "LinearAlgebra", "Logging", "Markdown", "MuladdMacro", "Parameters", "PreallocationTools", "PrecompileTools", "Printf", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLOperators", "SciMLStructures", "Setfield", "Static", "StaticArraysCore", "Statistics", "Tricks", "TruncatedStacktraces"] -git-tree-sha1 = "8977ef8249b602e4cb46ddbaf3c51e6adc2958c7" +deps = ["ArrayInterface", "ConcreteStructs", "DataStructures", "DocStringExtensions", "EnumX", "EnzymeCore", "FastBroadcast", "FastClosures", "ForwardDiff", "FunctionWrappers", "FunctionWrappersWrappers", "LinearAlgebra", "Logging", "Markdown", "MuladdMacro", "Parameters", "PreallocationTools", "PrecompileTools", "Printf", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLOperators", "SciMLStructures", "Setfield", "Static", "StaticArraysCore", "Statistics", "TruncatedStacktraces"] +git-tree-sha1 = "9c36ac68cf6c59a1c2569aadd7a62c47ed5c8eb5" uuid = "2b5f629d-d688-5b77-993f-72d75c75574e" -version = "6.157.0" +version = "6.158.1" [deps.DiffEqBase.extensions] DiffEqBaseCUDAExt = "CUDA" @@ -437,24 +403,6 @@ version = "6.157.0" Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c" Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d" -[[deps.DiffEqCallbacks]] -deps = ["ConcreteStructs", "DataStructures", "DiffEqBase", "DifferentiationInterface", "Functors", "LinearAlgebra", "Markdown", "RecipesBase", "RecursiveArrayTools", "SciMLBase", "StaticArraysCore"] -git-tree-sha1 = "7f700fa4fb6e55f4672f8218ef228107245a2e9d" -uuid = "459566f4-90b8-5000-8ac3-15dfb0a30def" -version = "4.0.0" - -[[deps.DiffEqNoiseProcess]] -deps = ["DiffEqBase", "Distributions", "GPUArraysCore", "LinearAlgebra", "Markdown", "Optim", "PoissonRandom", "QuadGK", "Random", "Random123", "RandomNumbers", "RecipesBase", "RecursiveArrayTools", "ResettableStacks", "SciMLBase", "StaticArraysCore", "Statistics"] -git-tree-sha1 = "ab1e6515ce15f01316a9825b02729fefa51726bd" -uuid = "77a26b50-5914-5dd7-bc55-306e6241c503" -version = "5.23.0" - - [deps.DiffEqNoiseProcess.extensions] - DiffEqNoiseProcessReverseDiffExt = "ReverseDiff" - - [deps.DiffEqNoiseProcess.weakdeps] - ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267" - [[deps.DiffResults]] deps = ["StaticArraysCore"] git-tree-sha1 = "782dd5f4561f5d267313f23853baaaa4c52ea621" @@ -468,10 +416,10 @@ uuid = "b552c78f-8df3-52c6-915a-8e097449b14b" version = "1.15.1" [[deps.DifferentiationInterface]] -deps = ["ADTypes", "Compat", "LinearAlgebra", "PackageExtensionCompat"] -git-tree-sha1 = "75d1716eb46e1b77304f7d79ec9ac6a4e6185d02" +deps = ["ADTypes", "LinearAlgebra"] +git-tree-sha1 = "758ef234ab0b81071c195cd2ea155030d69c1ef8" uuid = "a0c0ee7d-e4b9-4e03-894e-1c5f64a51d63" -version = "0.6.7" +version = "0.6.13" [deps.DifferentiationInterface.extensions] DifferentiationInterfaceChainRulesCoreExt = "ChainRulesCore" @@ -486,6 +434,7 @@ version = "0.6.7" DifferentiationInterfaceReverseDiffExt = "ReverseDiff" DifferentiationInterfaceSparseArraysExt = "SparseArrays" DifferentiationInterfaceSparseMatrixColoringsExt = "SparseMatrixColorings" + DifferentiationInterfaceStaticArraysExt = "StaticArrays" DifferentiationInterfaceSymbolicsExt = "Symbolics" DifferentiationInterfaceTrackerExt = "Tracker" DifferentiationInterfaceZygoteExt = ["Zygote", "ForwardDiff"] @@ -503,21 +452,11 @@ version = "0.6.7" ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267" SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" SparseMatrixColorings = "0a514795-09f3-496d-8182-132a7b665d35" + StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7" Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c" Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" -[[deps.DispatchDoctor]] -deps = ["MacroTools", "Preferences"] -git-tree-sha1 = "19eec8ee5cde1c10aa5e5e0f25d10a3b4c8f8f12" -uuid = "8d63f2c5-f18a-4cf2-ba9d-b3f60fc568c8" -version = "0.4.15" -weakdeps = ["ChainRulesCore", "EnzymeCore"] - - [deps.DispatchDoctor.extensions] - DispatchDoctorChainRulesCoreExt = "ChainRulesCore" - DispatchDoctorEnzymeCoreExt = "EnzymeCore" - [[deps.Distributed]] deps = ["Random", "Serialization", "Sockets"] uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" @@ -545,16 +484,6 @@ git-tree-sha1 = "2fb1e02f2b635d0845df5d7c167fec4dd739b00d" uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" version = "0.9.3" -[[deps.DomainSets]] -deps = ["CompositeTypes", "IntervalSets", "LinearAlgebra", "Random", "StaticArrays"] -git-tree-sha1 = "490392af2c7d63183bfa2c8aaa6ab981c5ba7561" -uuid = "5b8099bc-c8ec-5219-889f-1d9e522a28bf" -version = "0.7.14" -weakdeps = ["Makie"] - - [deps.DomainSets.extensions] - DomainSetsMakieExt = "Makie" - [[deps.Downloads]] deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"] uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6" @@ -566,30 +495,6 @@ git-tree-sha1 = "17c9db646d6cb3f68a90053bf46faf5312d13b36" uuid = "634d3b9d-ee7a-5ddf-bec9-22491ea816e1" version = "2.18.0" -[[deps.DynamicPolynomials]] -deps = ["Future", "LinearAlgebra", "MultivariatePolynomials", "MutableArithmetics", "Reexport", "Test"] -git-tree-sha1 = "bbf1ace0781d9744cb697fb856bd2c3f6568dadb" -uuid = "7c1d4256-1411-5781-91ec-d7bc3513ac07" -version = "0.6.0" - -[[deps.DynamicQuantities]] -deps = ["Compat", "DispatchDoctor", "PackageExtensionCompat", "TestItems", "Tricks"] -git-tree-sha1 = "82b3ab10e1d14cd79d813d30005d52ac3ef9ea97" -uuid = "06fc5a27-2a28-4c7c-a15d-362465fb6821" -version = "1.1.0" - - [deps.DynamicQuantities.extensions] - DynamicQuantitiesLinearAlgebraExt = "LinearAlgebra" - DynamicQuantitiesMeasurementsExt = "Measurements" - DynamicQuantitiesScientificTypesExt = "ScientificTypes" - DynamicQuantitiesUnitfulExt = "Unitful" - - [deps.DynamicQuantities.weakdeps] - LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" - Measurements = "eff96d63-e80a-5855-80a2-b1b0885c5ab7" - ScientificTypes = "321657f4-b219-11e9-178b-2701a2544e81" - Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d" - [[deps.EarCut_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "e3290f2d49e661fbd94046d7e3726ffcb2d41053" @@ -687,9 +592,9 @@ version = "2.0.4" [[deps.FileIO]] deps = ["Pkg", "Requires", "UUIDs"] -git-tree-sha1 = "82d8afa92ecf4b52d78d869f038ebfb881267322" +git-tree-sha1 = "62ca0547a14c57e98154423419d8a342dca75ca9" uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" -version = "1.16.3" +version = "1.16.4" [[deps.FilePaths]] deps = ["FilePathsBase", "MacroTools", "Reexport", "Requires"] @@ -724,11 +629,6 @@ weakdeps = ["PDMats", "SparseArrays", "Statistics"] FillArraysSparseArraysExt = "SparseArrays" FillArraysStatisticsExt = "Statistics" -[[deps.FindFirstFunctions]] -git-tree-sha1 = "670e1d9ceaa4a3161d32fe2d2fb2177f8d78b330" -uuid = "64ca27bc-2ba2-4a57-88aa-44e436879224" -version = "1.4.1" - [[deps.FiniteDiff]] deps = ["ArrayInterface", "LinearAlgebra", "Setfield"] git-tree-sha1 = "b10bdafd1647f57ace3885143936749d61638c3b" @@ -809,12 +709,6 @@ git-tree-sha1 = "b104d487b34566608f8b4e1c39fb0b10aa279ff8" uuid = "77dc65aa-8811-40c2-897b-53d922fa7daf" version = "0.1.3" -[[deps.Functors]] -deps = ["LinearAlgebra"] -git-tree-sha1 = "64d8e93700c7a3f28f717d265382d52fac9fa1c1" -uuid = "d9f16b24-f501-4c13-a1f2-28368ffc5196" -version = "0.4.12" - [[deps.Future]] deps = ["Random"] uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" @@ -834,9 +728,9 @@ version = "3.4.0+1" [[deps.GLMakie]] deps = ["ColorTypes", "Colors", "FileIO", "FixedPointNumbers", "FreeTypeAbstraction", "GLFW", "GeometryBasics", "LinearAlgebra", "Makie", "Markdown", "MeshIO", "ModernGL", "Observables", "PrecompileTools", "Printf", "ShaderAbstractions", "StaticArrays"] -git-tree-sha1 = "b8e3a20ffbd00595667324af704b3e6ce310fcdd" +git-tree-sha1 = "8a9f356bd5abb64c8b9a1fd6880c83a37973ddee" uuid = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a" -version = "0.10.13" +version = "0.10.14" [[deps.GPUArraysCore]] deps = ["Adapt"] @@ -879,11 +773,6 @@ git-tree-sha1 = "674ff0db93fffcd11a3573986e550d66cd4fd71f" uuid = "7746bdde-850d-59dc-9ae8-88ece973131d" version = "2.80.5+0" -[[deps.Glob]] -git-tree-sha1 = "97285bbd5230dd766e9ef6749b80fc617126d496" -uuid = "c27321d9-0574-5035-807b-f59d2c89b15c" -version = "1.3.1" - [[deps.Graphite2_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "344bf40dcab1073aca04aa0df4fb092f920e4011" @@ -1115,9 +1004,9 @@ version = "0.5.5" [[deps.JLLWrappers]] deps = ["Artifacts", "Preferences"] -git-tree-sha1 = "f389674c99bfcde17dc57454011aa44d5a260a40" +git-tree-sha1 = "be3dc50a92e5a386872a493a10050136d4703f9b" uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" -version = "1.6.0" +version = "1.6.1" [[deps.JSON]] deps = ["Dates", "Mmap", "Parsers", "Unicode"] @@ -1137,19 +1026,6 @@ git-tree-sha1 = "25ee0be4d43d0269027024d75a24c24d6c6e590c" uuid = "aacddb02-875f-59d6-b918-886e6ef4fbf8" version = "3.0.4+0" -[[deps.JuliaFormatter]] -deps = ["CSTParser", "CommonMark", "DataStructures", "Glob", "PrecompileTools", "TOML", "Tokenize"] -git-tree-sha1 = "5dec500b17416a7ec017f64fd8ebbd142ae8c1c2" -uuid = "98e50ef6-434e-11e9-1051-2b60c6c9e899" -version = "1.0.61" - -[[deps.JumpProcesses]] -deps = ["ArrayInterface", "DataStructures", "DiffEqBase", "DocStringExtensions", "FunctionWrappers", "Graphs", "LinearAlgebra", "Markdown", "PoissonRandom", "Random", "RandomNumbers", "RecursiveArrayTools", "Reexport", "SciMLBase", "Setfield", "StaticArrays", "SymbolicIndexingInterface", "UnPack"] -git-tree-sha1 = "6e0fb267f2c869df59b6bf9f8cb0f2794f2d85e9" -uuid = "ccbc3e58-028d-4f4c-8cd5-9ae44345cda5" -version = "9.13.7" -weakdeps = ["FastBroadcast"] - [[deps.KLU]] deps = ["LinearAlgebra", "SparseArrays", "SuiteSparse_jll"] git-tree-sha1 = "07649c499349dad9f08dde4243a4c597064663e9" @@ -1187,30 +1063,9 @@ uuid = "dd4b983a-f0e5-5f8d-a1b7-129d4a5fb1ac" version = "2.10.2+1" [[deps.LaTeXStrings]] -git-tree-sha1 = "50901ebc375ed41dbf8058da26f9de442febbbec" +git-tree-sha1 = "dda21b8cbd6a6c40d9d02a73230f9d70fed6918c" uuid = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f" -version = "1.3.1" - -[[deps.LambertW]] -git-tree-sha1 = "c5ffc834de5d61d00d2b0e18c96267cffc21f648" -uuid = "984bce1d-4616-540c-a9ee-88d1112d94c9" -version = "0.4.6" - -[[deps.Latexify]] -deps = ["Format", "InteractiveUtils", "LaTeXStrings", "MacroTools", "Markdown", "OrderedCollections", "Requires"] -git-tree-sha1 = "ce5f5621cac23a86011836badfedf664a612cee4" -uuid = "23fbe1c1-3f47-55db-b15f-69d7ec21a316" -version = "0.16.5" - - [deps.Latexify.extensions] - DataFramesExt = "DataFrames" - SparseArraysExt = "SparseArrays" - SymEngineExt = "SymEngine" - - [deps.Latexify.weakdeps] - DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" - SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" - SymEngine = "123dc426-2d89-5057-bbad-38513e3affd8" +version = "1.4.0" [[deps.LatticeRules]] deps = ["Random"] @@ -1430,9 +1285,9 @@ version = "0.5.13" [[deps.Makie]] deps = ["Animations", "Base64", "CRC32c", "ColorBrewer", "ColorSchemes", "ColorTypes", "Colors", "Contour", "Dates", "DelaunayTriangulation", "Distributions", "DocStringExtensions", "Downloads", "FFMPEG_jll", "FileIO", "FilePaths", "FixedPointNumbers", "Format", "FreeType", "FreeTypeAbstraction", "GeometryBasics", "GridLayoutBase", "ImageBase", "ImageIO", "InteractiveUtils", "Interpolations", "IntervalSets", "Isoband", "KernelDensity", "LaTeXStrings", "LinearAlgebra", "MacroTools", "MakieCore", "Markdown", "MathTeXEngine", "Observables", "OffsetArrays", "Packing", "PlotUtils", "PolygonOps", "PrecompileTools", "Printf", "REPL", "Random", "RelocatableFolders", "Scratch", "ShaderAbstractions", "Showoff", "SignedDistanceFields", "SparseArrays", "Statistics", "StatsBase", "StatsFuns", "StructArrays", "TriplotBase", "UnicodeFun", "Unitful"] -git-tree-sha1 = "50ebda951efaa11b6db0413c1128726b8eab3bf0" +git-tree-sha1 = "3df66da15ba7b37b34f6557b7e1c95a3ff5c670b" uuid = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a" -version = "0.21.13" +version = "0.21.14" [[deps.MakieCore]] deps = ["ColorTypes", "GeometryBasics", "IntervalSets", "Observables"] @@ -1492,24 +1347,6 @@ version = "1.2.0" uuid = "a63ad114-7e13-5084-954f-fe012c677804" version = "1.11.0" -[[deps.ModelingToolkit]] -deps = ["AbstractTrees", "ArrayInterface", "BlockArrays", "Combinatorics", "Compat", "ConstructionBase", "DataStructures", "DiffEqBase", "DiffEqCallbacks", "DiffEqNoiseProcess", "DiffRules", "Distributed", "Distributions", "DocStringExtensions", "DomainSets", "DynamicQuantities", "ExprTools", "Expronicon", "FindFirstFunctions", "ForwardDiff", "FunctionWrappers", "FunctionWrappersWrappers", "Graphs", "InteractiveUtils", "JuliaFormatter", "JumpProcesses", "Latexify", "Libdl", "LinearAlgebra", "MLStyle", "NaNMath", "NonlinearSolve", "OffsetArrays", "OrderedCollections", "PrecompileTools", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLBase", "SciMLStructures", "Serialization", "Setfield", "SimpleNonlinearSolve", "SparseArrays", "SpecialFunctions", "StaticArrays", "SymbolicIndexingInterface", "SymbolicUtils", "Symbolics", "URIs", "UnPack", "Unitful"] -git-tree-sha1 = "3747f7e2f54774a175bba06098629062bcb01950" -uuid = "961ee093-0014-501f-94e3-6117800e7a78" -version = "9.43.0" - - [deps.ModelingToolkit.extensions] - MTKBifurcationKitExt = "BifurcationKit" - MTKChainRulesCoreExt = "ChainRulesCore" - MTKDeepDiffsExt = "DeepDiffs" - MTKLabelledArraysExt = "LabelledArrays" - - [deps.ModelingToolkit.weakdeps] - BifurcationKit = "0f109fa4-8a5d-4b75-95aa-f515264e7665" - ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" - DeepDiffs = "ab62b9b5-e342-54a8-a765-a90f495de1a6" - LabelledArrays = "2ee39098-c373-598a-b85f-a56591580800" - [[deps.ModernGL]] deps = ["Libdl"] git-tree-sha1 = "b76ea40b5c0f45790ae09492712dd326208c28b2" @@ -1537,18 +1374,6 @@ git-tree-sha1 = "cac9cc5499c25554cba55cd3c30543cff5ca4fab" uuid = "46d2c3a1-f734-5fdb-9937-b9b9aeba4221" version = "0.2.4" -[[deps.MultivariatePolynomials]] -deps = ["ChainRulesCore", "DataStructures", "LinearAlgebra", "MutableArithmetics"] -git-tree-sha1 = "5c1d1d9361e1417e5a065e1f84dc3686cbdaea21" -uuid = "102ac46a-7ee4-5c85-9060-abc95bfdeaa3" -version = "0.5.6" - -[[deps.MutableArithmetics]] -deps = ["LinearAlgebra", "SparseArrays", "Test"] -git-tree-sha1 = "3eba928678787843e504c153a9b8e80d7d73ab17" -uuid = "d8a4904e-b15c-11e9-3269-09a3773c0cb0" -version = "1.5.0" - [[deps.NLSolversBase]] deps = ["DiffResults", "Distributed", "FiniteDiff", "ForwardDiff"] git-tree-sha1 = "a0b464d183da839699f4c79e7606d9d186ec172c" @@ -1653,18 +1478,6 @@ git-tree-sha1 = "13652491f6856acfd2db29360e1bbcd4565d04f1" uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e" version = "0.5.5+0" -[[deps.Optim]] -deps = ["Compat", "FillArrays", "ForwardDiff", "LineSearches", "LinearAlgebra", "NLSolversBase", "NaNMath", "Parameters", "PositiveFactorizations", "Printf", "SparseArrays", "StatsBase"] -git-tree-sha1 = "d9b79c4eed437421ac4285148fcadf42e0700e89" -uuid = "429524aa-4258-5aef-a3af-852621145aeb" -version = "1.9.4" - - [deps.Optim.extensions] - OptimMOIExt = "MathOptInterface" - - [deps.Optim.weakdeps] - MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee" - [[deps.Opus_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "6703a85cb3781bd5909d48730a67205f3f31a575" @@ -1696,9 +1509,9 @@ version = "1.1.2" [[deps.OrdinaryDiffEqCore]] deps = ["ADTypes", "Accessors", "Adapt", "ArrayInterface", "DataStructures", "DiffEqBase", "DocStringExtensions", "EnumX", "FastBroadcast", "FastClosures", "FillArrays", "FunctionWrappersWrappers", "InteractiveUtils", "LinearAlgebra", "Logging", "MacroTools", "MuladdMacro", "Polyester", "PrecompileTools", "Preferences", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLOperators", "SciMLStructures", "SimpleUnPack", "Static", "StaticArrayInterface", "StaticArraysCore", "TruncatedStacktraces"] -git-tree-sha1 = "33e4292e832d439c3706410ae867f3c091d79155" +git-tree-sha1 = "f4b7b11e2e4c0f4a7fe15d2edcec1e1ce2917d67" uuid = "bbf590c4-e513-4bbe-9b18-05decba2e5d8" -version = "1.7.0" +version = "1.7.1" weakdeps = ["EnzymeCore"] [deps.OrdinaryDiffEqCore.extensions] @@ -1946,12 +1759,6 @@ git-tree-sha1 = "7b1a9df27f072ac4c9c7cbe5efb198489258d1f5" uuid = "995b91a9-d308-5afd-9ec6-746e21dbc043" version = "1.4.1" -[[deps.PoissonRandom]] -deps = ["Random"] -git-tree-sha1 = "a0f1159c33f846aa77c3f30ebbc69795e5327152" -uuid = "e409e4f3-bfea-5376-8464-e040bb5c01ab" -version = "0.4.4" - [[deps.Polyester]] deps = ["ArrayInterface", "BitTwiddlingConvenienceFunctions", "CPUSummary", "IfElse", "ManualMemory", "PolyesterWeave", "Static", "StaticArrayInterface", "StrideArraysCore", "ThreadingUtilities"] git-tree-sha1 = "6d38fea02d983051776a856b7df75b30cf9a3c1f" @@ -1975,12 +1782,6 @@ git-tree-sha1 = "36d8b4b899628fb92c2749eb488d884a926614d3" uuid = "2dfb63ee-cc39-5dd5-95bd-886bf059d720" version = "1.4.3" -[[deps.PositiveFactorizations]] -deps = ["LinearAlgebra"] -git-tree-sha1 = "17275485f373e6673f7e7f97051f703ed5b15b20" -uuid = "85a6dd25-e78a-55b7-8502-1745935b8125" -version = "0.2.4" - [[deps.PreallocationTools]] deps = ["Adapt", "ArrayInterface", "ForwardDiff"] git-tree-sha1 = "6c62ce45f268f3f958821a1e5192cf91c75ae89c" @@ -2071,18 +1872,6 @@ deps = ["SHA"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" version = "1.11.0" -[[deps.Random123]] -deps = ["Random", "RandomNumbers"] -git-tree-sha1 = "4743b43e5a9c4a2ede372de7061eed81795b12e7" -uuid = "74087812-796a-5b5d-8853-05524746bad3" -version = "1.7.0" - -[[deps.RandomNumbers]] -deps = ["Random"] -git-tree-sha1 = "c6ec94d2aaba1ab2ff983052cf6a606ca5985902" -uuid = "e6cf234a-135c-5ec9-84dd-332b85af5143" -version = "1.6.0" - [[deps.RangeArrays]] git-tree-sha1 = "b9039e93773ddcfc828f12aadf7115b4b4d225f5" uuid = "b3c3ace0-ae52-54e7-9d0b-2c1406fd6b9d" @@ -2153,12 +1942,6 @@ git-tree-sha1 = "838a3a4188e2ded87a4f9f184b4b0d78a1e91cb7" uuid = "ae029012-a4dd-5104-9daa-d747884805df" version = "1.3.0" -[[deps.ResettableStacks]] -deps = ["StaticArrays"] -git-tree-sha1 = "256eeeec186fa7f26f2801732774ccf277f05db9" -uuid = "ae5879a3-cd67-5da8-be7f-38c6eb64a37b" -version = "1.1.1" - [[deps.Rmath]] deps = ["Random", "Rmath_jll"] git-tree-sha1 = "852bd0f55565a9e973fcfee83a84413270224dc4" @@ -2353,10 +2136,10 @@ uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" version = "1.11.0" [[deps.SparseConnectivityTracer]] -deps = ["ADTypes", "DocStringExtensions", "FillArrays", "LinearAlgebra", "Random", "Requires", "SparseArrays"] -git-tree-sha1 = "e5efbf152d3e14a513f19a9119b810340b7ac86b" +deps = ["ADTypes", "DocStringExtensions", "FillArrays", "LinearAlgebra", "Random", "SparseArrays"] +git-tree-sha1 = "35d346f6aa78814859f1f69cd4f41c24108afa00" uuid = "9f842d2f-2579-4b1d-911e-f412cf18a3f5" -version = "0.6.6" +version = "0.6.7" [deps.SparseConnectivityTracer.extensions] SparseConnectivityTracerDataInterpolationsExt = "DataInterpolations" @@ -2373,10 +2156,10 @@ version = "0.6.6" SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b" [[deps.SparseDiffTools]] -deps = ["ADTypes", "Adapt", "ArrayInterface", "Compat", "DataStructures", "FiniteDiff", "ForwardDiff", "Graphs", "LinearAlgebra", "PackageExtensionCompat", "Random", "Reexport", "SciMLOperators", "Setfield", "SparseArrays", "StaticArrayInterface", "StaticArrays", "Tricks", "UnPack", "VertexSafeGraphs"] -git-tree-sha1 = "7db12cef226aaa8ca730040c9c35e32b86a69b83" +deps = ["ADTypes", "Adapt", "ArrayInterface", "Compat", "DataStructures", "FiniteDiff", "ForwardDiff", "Graphs", "LinearAlgebra", "PackageExtensionCompat", "Random", "Reexport", "SciMLOperators", "Setfield", "SparseArrays", "StaticArrayInterface", "StaticArrays", "UnPack", "VertexSafeGraphs"] +git-tree-sha1 = "b906758c107b049b6b71599b9f928d9b14e5554a" uuid = "47a9eef4-7e08-11e9-0b38-333d64bd3804" -version = "2.22.0" +version = "2.23.0" [deps.SparseDiffTools.extensions] SparseDiffToolsEnzymeExt = "Enzyme" @@ -2393,10 +2176,14 @@ version = "2.22.0" Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" [[deps.SparseMatrixColorings]] -deps = ["ADTypes", "Compat", "DataStructures", "DocStringExtensions", "LinearAlgebra", "Random", "SparseArrays"] -git-tree-sha1 = "ad17e2069015839e58a1f9275608b405fae1f28e" +deps = ["ADTypes", "DataStructures", "DocStringExtensions", "LinearAlgebra", "Random", "SparseArrays"] +git-tree-sha1 = "ccc32032d8f6790ad198c99fb8ef20d8100a0de4" uuid = "0a514795-09f3-496d-8182-132a7b665d35" -version = "0.4.6" +version = "0.4.7" +weakdeps = ["Colors"] + + [deps.SparseMatrixColorings.extensions] + SparseMatrixColoringsColorsExt = "Colors" [[deps.Sparspak]] deps = ["Libdl", "LinearAlgebra", "Logging", "OffsetArrays", "Printf", "SparseArrays", "Test"] @@ -2526,51 +2313,9 @@ version = "7.7.0+0" [[deps.SymbolicIndexingInterface]] deps = ["Accessors", "ArrayInterface", "RuntimeGeneratedFunctions", "StaticArraysCore"] -git-tree-sha1 = "0225f7c62f5f78db35aae6abb2e5cabe38ce578f" +git-tree-sha1 = "b708e5c01d4aad69c148241bda3346fda1c550d2" uuid = "2efcf032-c050-4f8e-a9bb-153293bab1f5" -version = "0.3.31" - -[[deps.SymbolicLimits]] -deps = ["SymbolicUtils"] -git-tree-sha1 = "fabf4650afe966a2ba646cabd924c3fd43577fc3" -uuid = "19f23fe9-fdab-4a78-91af-e7b7767979c3" -version = "0.2.2" - -[[deps.SymbolicUtils]] -deps = ["AbstractTrees", "ArrayInterface", "Bijections", "ChainRulesCore", "Combinatorics", "ConstructionBase", "DataStructures", "DocStringExtensions", "DynamicPolynomials", "IfElse", "LinearAlgebra", "MultivariatePolynomials", "NaNMath", "Setfield", "SparseArrays", "SpecialFunctions", "StaticArrays", "SymbolicIndexingInterface", "TermInterface", "TimerOutputs", "Unityper"] -git-tree-sha1 = "3927e02dc7648a45ec6aa592bcd8374094a44740" -uuid = "d1185830-fcd6-423d-90d6-eec64667417b" -version = "3.7.1" - - [deps.SymbolicUtils.extensions] - SymbolicUtilsLabelledArraysExt = "LabelledArrays" - SymbolicUtilsReverseDiffExt = "ReverseDiff" - - [deps.SymbolicUtils.weakdeps] - LabelledArrays = "2ee39098-c373-598a-b85f-a56591580800" - ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267" - -[[deps.Symbolics]] -deps = ["ADTypes", "ArrayInterface", "Bijections", "CommonWorldInvalidations", "ConstructionBase", "DataStructures", "DiffRules", "Distributions", "DocStringExtensions", "DomainSets", "DynamicPolynomials", "IfElse", "LaTeXStrings", "LambertW", "Latexify", "Libdl", "LinearAlgebra", "LogExpFunctions", "MacroTools", "Markdown", "NaNMath", "PrecompileTools", "Primes", "RecipesBase", "Reexport", "RuntimeGeneratedFunctions", "SciMLBase", "Setfield", "SparseArrays", "SpecialFunctions", "StaticArraysCore", "SymbolicIndexingInterface", "SymbolicLimits", "SymbolicUtils", "TermInterface"] -git-tree-sha1 = "6a7c7cd9bd8c051877a5a29fb597b18362dbc4e4" -uuid = "0c5d862f-8b57-4792-8d23-62f2024744c7" -version = "6.13.1" - - [deps.Symbolics.extensions] - SymbolicsForwardDiffExt = "ForwardDiff" - SymbolicsGroebnerExt = "Groebner" - SymbolicsLuxExt = "Lux" - SymbolicsNemoExt = "Nemo" - SymbolicsPreallocationToolsExt = ["PreallocationTools", "ForwardDiff"] - SymbolicsSymPyExt = "SymPy" - - [deps.Symbolics.weakdeps] - ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" - Groebner = "0b43b601-686d-58a3-8a1c-6623616c7cd4" - Lux = "b2108857-7c20-44ae-9111-449ecde12c47" - Nemo = "2edaba10-b0f1-5616-af89-8c11ac63239a" - PreallocationTools = "d236fae5-4411-538c-8e31-a6e3d9e00b46" - SymPy = "24249f21-da20-56a4-8eb1-6a02cf4ae2e6" +version = "0.3.32" [[deps.TOML]] deps = ["Dates"] @@ -2600,21 +2345,11 @@ git-tree-sha1 = "1feb45f88d133a655e001435632f019a9a1bcdb6" uuid = "62fd8b95-f654-4bbd-a8a5-9c27f68ccd50" version = "0.1.1" -[[deps.TermInterface]] -git-tree-sha1 = "d673e0aca9e46a2f63720201f55cc7b3e7169b16" -uuid = "8ea1fca8-c5ef-4a55-8b96-4e9afe9c9a3c" -version = "2.0.0" - [[deps.Test]] deps = ["InteractiveUtils", "Logging", "Random", "Serialization"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" version = "1.11.0" -[[deps.TestItems]] -git-tree-sha1 = "42fd9023fef18b9b78c8343a4e2f3813ffbcefcb" -uuid = "1c621080-faea-4a02-84b6-bbd5e436b8fe" -version = "1.0.0" - [[deps.ThreadingUtilities]] deps = ["ManualMemory"] git-tree-sha1 = "eda08f7e9818eb53661b3deb74e3159460dfbc27" @@ -2623,9 +2358,9 @@ version = "0.5.2" [[deps.TiffImages]] deps = ["ColorTypes", "DataStructures", "DocStringExtensions", "FileIO", "FixedPointNumbers", "IndirectArrays", "Inflate", "Mmap", "OffsetArrays", "PkgVersion", "ProgressMeter", "SIMD", "UUIDs"] -git-tree-sha1 = "bc7fd5c91041f44636b2c134041f7e5263ce58ae" +git-tree-sha1 = "38f139cc4abf345dd4f22286ec000728d5e8e097" uuid = "731e570b-9d59-4bfa-96dc-6df516fadf69" -version = "0.10.0" +version = "0.10.2" [[deps.TimerOutputs]] deps = ["ExprTools", "Printf"] @@ -2633,11 +2368,6 @@ git-tree-sha1 = "3a6f063d690135f5c1ba351412c82bae4d1402bf" uuid = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f" version = "0.5.25" -[[deps.Tokenize]] -git-tree-sha1 = "468b4685af4abe0e9fd4d7bf495a6554a6276e75" -uuid = "0796e94c-ce3b-5d07-9a54-7f471281c624" -version = "0.5.29" - [[deps.TranscodingStreams]] git-tree-sha1 = "0c45878dcfdcfa8480052b6ab162cdd138781742" uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa" @@ -2649,11 +2379,6 @@ git-tree-sha1 = "be986ad9dac14888ba338c2554dcfec6939e1393" uuid = "d5829a12-d9aa-46ab-831f-fb7c9ab06edf" version = "0.2.1" -[[deps.Tricks]] -git-tree-sha1 = "7822b97e99a1672bfb1b49b668a6d46d58d8cbcb" -uuid = "410a4b4d-49e4-4fbc-ab6d-cb71b17b3775" -version = "0.1.9" - [[deps.TriplotBase]] git-tree-sha1 = "4d4ed7f294cda19382ff7de4c137d24d16adc89b" uuid = "981d1d27-644d-49a2-9326-4793e63143c3" @@ -2665,11 +2390,6 @@ git-tree-sha1 = "ea3e54c2bdde39062abf5a9758a23735558705e1" uuid = "781d530d-4396-4725-bb49-402e4bee1e77" version = "1.4.0" -[[deps.URIs]] -git-tree-sha1 = "67db6cc7b3821e19ebe75791a9dd19c9b1188f2b" -uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4" -version = "1.5.1" - [[deps.UUIDs]] deps = ["Random", "SHA"] uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" @@ -2701,12 +2421,6 @@ weakdeps = ["ConstructionBase", "InverseFunctions"] ConstructionBaseUnitfulExt = "ConstructionBase" InverseFunctionsUnitfulExt = "InverseFunctions" -[[deps.Unityper]] -deps = ["ConstructionBase"] -git-tree-sha1 = "25008b734a03736c41e2a7dc314ecb95bd6bbdb0" -uuid = "a7c27f48-0311-42f6-a7f8-2c11e75eb415" -version = "0.1.6" - [[deps.VectorizationBase]] deps = ["ArrayInterface", "CPUSummary", "HostCPUFeatures", "IfElse", "LayoutPointers", "Libdl", "LinearAlgebra", "SIMDTypes", "Static", "StaticArrayInterface"] git-tree-sha1 = "e7f5b81c65eb858bed630fe006837b935518aca5" diff --git a/Project.toml b/Project.toml index 6dc8d58..40aa24e 100644 --- a/Project.toml +++ b/Project.toml @@ -7,10 +7,7 @@ DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" DrWatson = "634d3b9d-ee7a-5ddf-bec9-22491ea816e1" GLMakie = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a" Integrals = "de52edbc-65ea-441a-8357-d3a637375a31" -Latexify = "23fbe1c1-3f47-55db-b15f-69d7ec21a316" -ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78" OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed" -Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7" [compat] DrWatson = "2.18.0" diff --git a/scripts/provaDiffeq.jl b/scripts/provaDiffeq.jl index 5ca6924..365d47d 100644 --- a/scripts/provaDiffeq.jl +++ b/scripts/provaDiffeq.jl @@ -22,7 +22,7 @@ y₁ = vcat(x₁, zeros(N)) ywant = hcat(y₁, zeros(2N), zeros(2N)) # Initialize storage for results -xⁱ = zeros(N, o, Niter) +xⁱ = zeros(N, o, Niter) vⁱ = zeros(N, o, Niter) uⁱ = zeros(1, o, Niter) αrray = zeros(2N, o, Niter) @@ -39,8 +39,8 @@ u0 = vcat(zeros(N), zeros(N), 0.0) tspan = (0.0, T[end]) for i in 1:Niter # Set up and solve ODE - p = (A, B, C, αrray[:,:,i], T) - prob = ODEProblem(mass_spring_damper!, u0, tspan, p) + p = (A, B, C, αrray[:,:,i], T,utotn) + prob = ODEProblem(mass_spring_damper2!, u0, tspan, p) sol = solve(prob,Tsit5(),abstol= 1e-9) solarray[i] = sol @@ -48,7 +48,7 @@ for i in 1:Niter for (j, t) in enumerate(T) xⁱ[:, j, i] = sol(t)[1:N] vⁱ[:, j, i] = sol(t)[N+1:2N] - uⁱ[:, j, i] = sol(t)[end:end] + #uⁱ[:, j, i] = sol(t)[end:end] end # Update α for next iteration @@ -62,8 +62,9 @@ end # Time vector from the solution (full time points) t_vals = 0.0:0.05:T[end] x_vals = [solarray[end](t)[1:N] for t in t_vals] # Position data -v_vals = [solarray[end](t)[N+1:2N] for t in t_vals] # Velocity data -u_vals = [solarray[end](t)[end] for t in t_vals] # Control input over time +v_vals = [solarray[end](t)[N+1:2N] for t in t_vals] # Velocity data +u_vals = [utotn(A, B, C, αrray[:,:,end], t, T) for t in t_vals] +#u_vals = [solarray[end](t)[end] for t in t_vals] # Control input over time # Creating the figure f = Figure(resolution = (1200, 1000)) @@ -83,17 +84,17 @@ for i in 1:N scatter!(ax2, T, ywant[N+i,:], color=:black, marker=:x, markersize=8) # Desired velocities as x markers end axislegend(ax2) -## +# base_vals = zeros(o,2N,length(t_vals)) # 3. Base functions plot using upi ax3 = Axis(f[3, 1], title="Base Functions π", xlabel="Time", ylabel="Base Functions") for i in 1:o base_vals[i,:,:] .= hcat([upi(A, B, C, t, T, i) for t in t_vals]...) - for j in 8:8# Using upi to compute the base functions + for j in 1:2N# Using upi to compute the base functions lines!(ax3, t_vals, base_vals[i,j,:]) end end -## +# # 4. Control Action plot (input uₙ) ax4 = Axis(f[4, 1], title="Control Action uₙ", xlabel="Time", ylabel="Control Action") lines!(ax4, t_vals, u_vals, color=:black) diff --git a/src/fun2.jl b/src/fun2.jl index 4c22167..b95a2bb 100644 --- a/src/fun2.jl +++ b/src/fun2.jl @@ -27,7 +27,7 @@ function utotn(A, B, C, α, t, T) minT = [0.0; T[1:end-1]] return sum( if t <= T[i] && t > minT[i] - dot(CAtB(A, B, C, T[i]-t)', α[:,i]) + dot(CAtB(A, B, C, T[i]-t), α[:,i]) else 0.0 end @@ -45,9 +45,9 @@ function upi(A,B,C,t,T,i) end function mass_spring_damper2!(du, u, p, t) - A, B, C, α, T = p + A, B, C, α, T, f = p - du[1:2N] = A * u[1:2N] + B * utotn(A, B, C, α, t, T) + du[1:2N] = A * u[1:2N] + B * f(A, B, C, α, t, T) end function mass_spring_damper!(du, u, p, t)