Skip to content

Commit d69999d

Browse files
committed
ticker shows g value if infeasible and z otherwise
1 parent 1852ff5 commit d69999d

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

fresa.org

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ Fresa depends on a number of packages that should be available in any Julia inst
424424

425425
#+name: init
426426
#+begin_src julia :var version=(org-sbe tomlversion)
427-
lastchange = "[2023-04-18 10:56+0100]"
427+
lastchange = "[2023-04-27 15:10+0100]"
428428
using Dates # for org mode dates
429429
using LinearAlgebra # for norm function
430430
using Printf # for formatted output
@@ -1348,7 +1348,9 @@ The *output* of the progress during the search is controlled by the ~output~ opt
13481348
if output >= 0
13491349
print(stderr, ": $nf@$gen npop $(length(newpop))/$(length(pop))",
13501350
archiveelite ? " na=$(length(archive))" : "",
1351-
" most fit z=$(best.z) \r")
1351+
" most fit ",
1352+
best.g ≤ 0 ? "z=$(best.z)" : "g=$(best.g)",
1353+
" \r")
13521354
# if output has been requested, check to see if output is
13531355
# required now and then also check to see if the frequency
13541356
# needs to be reduced.

src/Fresa.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module Fresa
88

99
# [[file:../fresa.org::init][init]]
1010
version = "8.0.0"
11-
lastchange = "[2023-04-18 10:56+0100]"
11+
lastchange = "[2023-04-27 15:10+0100]"
1212
using Dates # for org mode dates
1313
using LinearAlgebra # for norm function
1414
using Printf # for formatted output
@@ -646,7 +646,9 @@ function solve(f, p0; # required arguments
646646
if output >= 0
647647
print(stderr, ": $nf@$gen npop $(length(newpop))/$(length(pop))",
648648
archiveelite ? " na=$(length(archive))" : "",
649-
" most fit z=$(best.z) \r")
649+
" most fit ",
650+
best.g 0 ? "z=$(best.z)" : "g=$(best.g)",
651+
" \r")
650652
# if output has been requested, check to see if output is
651653
# required now and then also check to see if the frequency
652654
# needs to be reduced.

0 commit comments

Comments
 (0)