From 23265aa10aa4f60ff441efdea4b5a70cb17abe3e Mon Sep 17 00:00:00 2001 From: leburgel Date: Thu, 24 Sep 2026 11:27:02 +0200 Subject: [PATCH] Remove rogue merge artifact from Defaults docstring --- src/Defaults.jl | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Defaults.jl b/src/Defaults.jl index 13ba67ce2..17c22c72d 100644 --- a/src/Defaults.jl +++ b/src/Defaults.jl @@ -89,16 +89,13 @@ Module containing default algorithm parameter values and arguments. - `:GeomSum` : Geometric sum approximation of the Neumann series of the inverse Jacobian, see [`PEPSKit.GeomSum`](@ref) for details - `:ManualIter` : Manual fixed-point iteration, see [`PEPSKit.ManualIter`](@ref) for details * `gradient_fixedpoint_solver_eager=$(Defaults.gradient_fixedpoint_solver_eager)` : Enables `:Arnoldi` solver algorithm to finish before the full Krylov dimension is reached. -<<<<<<< HEAD * `gradient_implicit_solver_alg=:$(Defaults.gradient_implicit_solver_alg)` : Default solver algorithm for the `ImplicitGradient` gradient algorithm. - `:GMRES` : GMRES iterative linear solver, see [`KrylovKit.GMRES`](@extref) for details - `:BiCGStab` : BiCGStab iterative linear solver, see [`KrylovKit.BiCGStab`](@extref) for details -======= * `gradient_dynamic_tols=$(Defaults.gradient_dynamic_tols)` : If `true`, wrap the gradient algorithm used during variational optimization in an `MPSKit.DynamicTols.DynamicTol` that rescales its tolerance based on the effective (possibly dynamically-scaled) tolerance of the boundary algorithm, see [`PEPSKit.PEPSOptimize`](@ref). * `gradient_tol_min=$(Defaults.gradient_tol_min)` : Minimal gradient algorithm tolerance used by `gradient_dynamic_tols`. * `gradient_tol_max=$(Defaults.gradient_tol_max)` : Maximal gradient algorithm tolerance used by `gradient_dynamic_tols`. * `gradient_tol_factor=$(Defaults.gradient_tol_factor)` : Tolerance scaling factor relative to the boundary algorithm's tolerance, used by `gradient_dynamic_tols` (e.g. `10` makes the gradient tolerance ~10x looser than the boundary tolerance). ->>>>>>> main ## Preconditioning