Change extracter etc to extract, update, insert. Change related kwarg names.

Author: emstoudenmire

src/solvers/applyexp.jl

@@ -22,7 +22,7 @@ function region_plan(tdvp::ApplyExpProblem; nsites, time_step, sweep_kwargs...)
   return tdvp_regions(state(tdvp), time_step; nsites, sweep_kwargs...)
 end
 
-function updater(
+function update(
   prob::ApplyExpProblem,
   local_state,
   region_iterator;
@@ -70,9 +70,9 @@ function applyexp(
   operator::AbstractITensorNetwork,
   exponents,
   init_state::AbstractITensorNetwork;
-  extracter_kwargs=(;),
-  updater_kwargs=(;),
-  inserter_kwargs=(;),
+  extract_kwargs=(;),
+  update_kwargs=(;),
+  insert_kwargs=(;),
   outputlevel=0,
   nsites=1,
   tdvp_order=4,
@@ -83,7 +83,7 @@ function applyexp(
   )
   time_steps = diff([0.0, exponents...])[2:end]
   sweep_kws = (;
-    outputlevel, extracter_kwargs, inserter_kwargs, nsites, tdvp_order, updater_kwargs
+    outputlevel, extract_kwargs, insert_kwargs, nsites, tdvp_order, update_kwargs
   )
   kws_array = [(; sweep_kws..., time_step=t) for t in time_steps]
   sweep_iter = sweep_iterator(init_prob, kws_array)

src/solvers/eigsolve.jl

@@ -18,7 +18,7 @@ function set_eigenvalue(E::EigsolveProblem, eigenvalue)
 end
 set_state(E::EigsolveProblem, state) = EigsolveProblem(E.operator, state, E.eigenvalue)
 
-function updater(
+function update(
   prob::EigsolveProblem,
   local_state,
   region_iterator;
@@ -56,22 +56,16 @@ function eigsolve(
   nsweeps,
   nsites=1,
   outputlevel=0,
-  extracter_kwargs=(;),
-  updater_kwargs=(;),
-  inserter_kwargs=(;),
+  extract_kwargs=(;),
+  update_kwargs=(;),
+  insert_kwargs=(;),
   kws...,
 )
   init_prob = EigsolveProblem(;
     state=align_indices(init_state), operator=ProjTTN(align_indices(operator))
   )
   sweep_iter = sweep_iterator(
-    init_prob,
-    nsweeps;
-    nsites,
-    outputlevel,
-    extracter_kwargs,
-    updater_kwargs,
-    inserter_kwargs,
+    init_prob, nsweeps; nsites, outputlevel, extract_kwargs, update_kwargs, insert_kwargs
   )
   prob = sweep_solve(sweep_iter; outputlevel, kws...)
   return eigenvalue(prob), state(prob)

src/solvers/extracter.jl

@@ -1,4 +1,4 @@
-function extracter(problem, region_iterator; sweep, trunc=(;), kws...)
+function extract(problem, region_iterator; sweep, trunc=(;), kws...)
   trunc = truncation_parameters(sweep; trunc...)
   region = current_region(region_iterator)
   psi = orthogonalize(state(problem), region)

src/solvers/inserter.jl

@@ -1,6 +1,6 @@
 using NamedGraphs: edgetype
 
-function inserter(
+function insert(
   problem,
   local_tensor,
   region_iterator;

src/solvers/iterators.jl

@@ -81,21 +81,17 @@ end
 function region_step(
   problem,
   region_iterator;
-  extracter_kwargs=(;),
-  updater_kwargs=(;),
-  inserter_kwargs=(;),
+  extract_kwargs=(;),
+  update_kwargs=(;),
+  insert_kwargs=(;),
   sweep,
   kws...,
 )
-  problem, local_state = extracter(
-    problem, region_iterator; extracter_kwargs..., sweep, kws...
-  )
-  problem, local_state = updater(
-    problem, local_state, region_iterator; updater_kwargs..., kws...
-  )
-  problem = inserter(
-    problem, local_state, region_iterator; sweep, inserter_kwargs..., kws...
+  problem, local_state = extract(problem, region_iterator; extract_kwargs..., sweep, kws...)
+  problem, local_state = update(
+    problem, local_state, region_iterator; update_kwargs..., kws...
   )
+  problem = insert(problem, local_state, region_iterator; sweep, insert_kwargs..., kws...)
   return problem
 end
 

src/solvers/region_plans/tdvp_region_plans.jl

@@ -12,16 +12,16 @@ function tdvp_sub_time_steps(tdvp_order)
 end
 
 function first_order_sweep(
-  graph, time_step, dir=Base.Forward; updater_kwargs, nsites, kws...
+  graph, time_step, dir=Base.Forward; update_kwargs, nsites, kws...
 )
   basic_fwd_sweep = post_order_dfs_plan(graph; nsites, kws...)
-  updater_kwargs = (; nsites, time_step, updater_kwargs...)
+  update_kwargs = (; nsites, time_step, update_kwargs...)
   sweep = []
   for (j, (region, region_kws)) in enumerate(basic_fwd_sweep)
-    push!(sweep, (region, (; nsites, updater_kwargs, region_kws...)))
+    push!(sweep, (region, (; nsites, update_kwargs, region_kws...)))
     if length(region) == 2 && j < length(basic_fwd_sweep)
-      rev_kwargs = (; updater_kwargs..., time_step=(-updater_kwargs.time_step))
-      push!(sweep, ([last(region)], (; updater_kwargs=rev_kwargs, region_kws...)))
+      rev_kwargs = (; update_kwargs..., time_step=(-update_kwargs.time_step))
+      push!(sweep, ([last(region)], (; update_kwargs=rev_kwargs, region_kws...)))
     end
   end
   if dir==Base.Reverse
@@ -31,13 +31,13 @@ function first_order_sweep(
   return sweep
 end
 
-function tdvp_regions(graph, time_step; updater_kwargs, tdvp_order, nsites, kws...)
+function tdvp_regions(graph, time_step; update_kwargs, tdvp_order, nsites, kws...)
   sweep_plan = []
   for (step, weight) in enumerate(tdvp_sub_time_steps(tdvp_order))
     dir = isodd(step) ? Base.Forward : Base.Reverse
     append!(
       sweep_plan,
-      first_order_sweep(graph, weight*time_step, dir; updater_kwargs, nsites, kws...),
+      first_order_sweep(graph, weight*time_step, dir; update_kwargs, nsites, kws...),
     )
   end
   return sweep_plan

src/solvers/subspace/subspace.jl

@@ -39,7 +39,7 @@ function compute_expansion(
 
   # Restrict expand_maxdim below theoretical upper limit
   expand_maxdim = min(basis_size-current_dim, expand_maxdim)
-  # Enforce total maxdim setting (e.g. used in inserter step)
+  # Enforce total maxdim setting (e.g. used in insert step)
   expand_maxdim = min(maxdim-current_dim, expand_maxdim)
   # Ensure expand_maxdim is non-negative
   expand_maxdim = max(0, expand_maxdim)

test/solvers/test_tree_applyexp.jl

@@ -50,20 +50,20 @@ end
 
   nsites = 2
   trunc = (; cutoff, maxdim)
-  E, gs_psi = dmrg(H, psi0; inserter_kwargs=(; trunc), nsites, nsweeps, outputlevel)
+  E, gs_psi = dmrg(H, psi0; insert_kwargs=(; trunc), nsites, nsweeps, outputlevel)
   (outputlevel >= 1) && println("2-site DMRG energy = ", E)
 
-  inserter_kwargs=(; trunc)
+  insert_kwargs=(; trunc)
   nsites = 1
   tmax = 0.10
   time_range = 0.0:0.02:tmax
-  psi1_t = time_evolve(H, time_range, gs_psi; inserter_kwargs, nsites, outputlevel)
+  psi1_t = time_evolve(H, time_range, gs_psi; insert_kwargs, nsites, outputlevel)
   (outputlevel >= 1) && println("Done with $nsites-site TDVP")
 
   @test norm(psi1_t) > 0.999
 
   nsites = 2
-  psi2_t = time_evolve(H, time_range, gs_psi; inserter_kwargs, nsites, outputlevel)
+  psi2_t = time_evolve(H, time_range, gs_psi; insert_kwargs, nsites, outputlevel)
   (outputlevel >= 1) && println("Done with $nsites-site TDVP")
   @test norm(psi2_t) > 0.999
 

test/solvers/test_tree_eigsolve.jl

@@ -45,8 +45,8 @@ include("utilities/tree_graphs.jl")
   #
   nsites = 2
   trunc = (; cutoff, maxdim)
-  inserter_kwargs = (; trunc)
-  E, psi = dmrg(H, psi0; inserter_kwargs, nsites, nsweeps, outputlevel)
+  insert_kwargs = (; trunc)
+  E, psi = dmrg(H, psi0; insert_kwargs, nsites, nsweeps, outputlevel)
   (outputlevel >= 1) && println("2-site DMRG energy = ", E)
   @test abs(E-Ex) < 1E-5
 
@@ -56,9 +56,9 @@ include("utilities/tree_graphs.jl")
   nsites = 1
   nsweeps = 5
   trunc = (; cutoff, maxdim)
-  extracter_kwargs = (; trunc, subspace_algorithm="densitymatrix")
-  inserter_kwargs = (; trunc)
-  E, psi = dmrg(H, psi0; extracter_kwargs, inserter_kwargs, nsites, nsweeps, outputlevel)
+  extract_kwargs = (; trunc, subspace_algorithm="densitymatrix")
+  insert_kwargs = (; trunc)
+  E, psi = dmrg(H, psi0; extract_kwargs, insert_kwargs, nsites, nsweeps, outputlevel)
   (outputlevel >= 1) && println("1-site+subspace DMRG energy = ", E)
   @test abs(E-Ex) < 1E-5
 end