From 2cc944466780357baa7b66fd4782f704852cde87 Mon Sep 17 00:00:00 2001 From: Marek Kaluba Date: Thu, 17 Nov 2022 11:22:17 +0100 Subject: [PATCH] small fixes --- scripts/SpN_Adj.jl | 2 +- src/PropertyT.jl | 2 +- src/solve.jl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/SpN_Adj.jl b/scripts/SpN_Adj.jl index 80b9b65..c5922de 100644 --- a/scripts/SpN_Adj.jl +++ b/scripts/SpN_Adj.jl @@ -68,7 +68,7 @@ solve_in_loop( model, wd, varP, - logdir="./log/r=$HALFRADIUS/Sp($N,Z)/Adj_C₂-InfΔ", + logdir="./log/Sp($N,Z)/r=$HALFRADIUS/Adj_C₂-InfΔ", optimizer=cosmo_optimizer( eps=1e-10, max_iters=20_000, diff --git a/src/PropertyT.jl b/src/PropertyT.jl index ac32da9..6b97d5d 100644 --- a/src/PropertyT.jl +++ b/src/PropertyT.jl @@ -29,7 +29,7 @@ include("actions/actions.jl") function group_algebra(G::Groups.Group, S=gens(G); halfradius::Integer, twisted::Bool) S = union!(S, inv.(S)) @info "generating wl-metric ball of radius $(2halfradius)" - @time E, sizes = Groups.wlmetric_ball_serial(S, radius=2halfradius) + @time E, sizes = Groups.wlmetric_ball(S, radius=2halfradius) @info "sizes = $(sizes)" @info "computing the *-algebra structure for G" @time RG = StarAlgebras.StarAlgebra{twisted}( diff --git a/src/solve.jl b/src/solve.jl index 9d76194..e7df555 100644 --- a/src/solve.jl +++ b/src/solve.jl @@ -39,7 +39,6 @@ function solve(m::JuMP.Model, optimizer, warmstart=nothing) m = setwarmstart!(m, warmstart) JuMP.optimize!(m) - Base.Libc.flush_cstdio() status = JuMP.termination_status(m) @@ -55,6 +54,7 @@ function solve(solverlog::String, m::JuMP.Model, optimizer, warmstart=nothing) status, warmstart = open(solverlog, "a+") do logfile redirect_stdout(logfile) do status, warmstart = solve(m, optimizer, warmstart) + Base.Libc.flush_cstdio() status, warmstart end end