Diff of the two buildlogs: -- --- b1/build.log 2024-04-06 14:49:00.043947257 +0000 +++ b2/build.log 2024-04-06 15:01:32.059831845 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Sat Apr 6 02:23:20 -12 2024 -I: pbuilder-time-stamp: 1712413400 +I: Current time: Sun Apr 7 04:49:20 +14 2024 +I: pbuilder-time-stamp: 1712414960 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/unstable-reproducible-base.tgz] I: copying local configuration @@ -36,52 +36,84 @@ dpkg-source: info: applying octave9.patch I: Not using root during the build. I: Installing the build-deps -I: user script /srv/workspace/pbuilder/8944/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/32063/tmp/hooks/D01_modify_environment starting +debug: Running on virt64c. +I: Changing host+domainname to test build reproducibility +I: Adding a custom variable just for the fun of it... +I: Changing /bin/sh to bash +'/bin/sh' -> '/bin/bash' +lrwxrwxrwx 1 root root 9 Apr 6 14:49 /bin/sh -> /bin/bash +I: Setting pbuilder2's login shell to /bin/bash +I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other +I: user script /srv/workspace/pbuilder/32063/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/32063/tmp/hooks/D02_print_environment starting I: set - BUILDDIR='/build/reproducible-path' - BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other' - BUILDUSERNAME='pbuilder1' - BUILD_ARCH='armhf' - DEBIAN_FRONTEND='noninteractive' - DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=3 ' - DISTRIBUTION='unstable' - HOME='/root' - HOST_ARCH='armhf' + BASH=/bin/sh + BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:globskipdots:hostcomplete:interactive_comments:patsub_replacement:progcomp:promptvars:sourcepath + BASH_ALIASES=() + BASH_ARGC=() + BASH_ARGV=() + BASH_CMDS=() + BASH_LINENO=([0]="12" [1]="0") + BASH_LOADABLES_PATH=/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:. + BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment") + BASH_VERSINFO=([0]="5" [1]="2" [2]="21" [3]="1" [4]="release" [5]="arm-unknown-linux-gnueabihf") + BASH_VERSION='5.2.21(1)-release' + BUILDDIR=/build/reproducible-path + BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other' + BUILDUSERNAME=pbuilder2 + BUILD_ARCH=armhf + DEBIAN_FRONTEND=noninteractive + DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=4 ' + DIRSTACK=() + DISTRIBUTION=unstable + EUID=0 + FUNCNAME=([0]="Echo" [1]="main") + GROUPS=() + HOME=/root + HOSTNAME=i-capture-the-hostname + HOSTTYPE=arm + HOST_ARCH=armhf IFS=' ' - INVOCATION_ID='ad75b3bb275148b098b645d1ede47226' - LANG='C' - LANGUAGE='en_US:en' - LC_ALL='C' - MAIL='/var/mail/root' - OPTIND='1' - PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games' - PBCURRENTCOMMANDLINEOPERATION='build' - PBUILDER_OPERATION='build' - PBUILDER_PKGDATADIR='/usr/share/pbuilder' - PBUILDER_PKGLIBDIR='/usr/lib/pbuilder' - PBUILDER_SYSCONFDIR='/etc' - PPID='8944' - PS1='# ' - PS2='> ' + INVOCATION_ID=226e26e28f9e412bae4332fe18734deb + LANG=C + LANGUAGE=it_CH:it + LC_ALL=C + MACHTYPE=arm-unknown-linux-gnueabihf + MAIL=/var/mail/root + OPTERR=1 + OPTIND=1 + OSTYPE=linux-gnueabihf + PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path + PBCURRENTCOMMANDLINEOPERATION=build + PBUILDER_OPERATION=build + PBUILDER_PKGDATADIR=/usr/share/pbuilder + PBUILDER_PKGLIBDIR=/usr/lib/pbuilder + PBUILDER_SYSCONFDIR=/etc + PIPESTATUS=([0]="0") + POSIXLY_CORRECT=y + PPID=32063 PS4='+ ' - PWD='/' - SHELL='/bin/bash' - SHLVL='2' - SUDO_COMMAND='/usr/bin/timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.URzF4i8D/pbuilderrc_znK7 --distribution unstable --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/unstable-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.URzF4i8D/b1 --logfile b1/build.log octave-level-set_0.3.1~git.2019.04.13-7.dsc' - SUDO_GID='116' - SUDO_UID='112' - SUDO_USER='jenkins' - TERM='unknown' - TZ='/usr/share/zoneinfo/Etc/GMT+12' - USER='root' - _='/usr/bin/systemd-run' - http_proxy='http://10.0.0.15:3142/' + PWD=/ + SHELL=/bin/bash + SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix + SHLVL=3 + SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.URzF4i8D/pbuilderrc_vcxw --distribution unstable --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/unstable-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.URzF4i8D/b2 --logfile b2/build.log octave-level-set_0.3.1~git.2019.04.13-7.dsc' + SUDO_GID=113 + SUDO_UID=107 + SUDO_USER=jenkins + TERM=unknown + TZ=/usr/share/zoneinfo/Etc/GMT-14 + UID=0 + USER=root + _='I: set' + http_proxy=http://10.0.0.15:3142/ I: uname -a - Linux cbxi4b 6.1.0-18-armmp #1 SMP Debian 6.1.76-1 (2024-02-01) armv7l GNU/Linux + Linux i-capture-the-hostname 6.1.0-18-arm64 #1 SMP Debian 6.1.76-1 (2024-02-01) aarch64 GNU/Linux I: ls -l /bin - lrwxrwxrwx 1 root root 7 Apr 6 07:46 /bin -> usr/bin -I: user script /srv/workspace/pbuilder/8944/tmp/hooks/D02_print_environment finished + lrwxrwxrwx 1 root root 7 Apr 5 07:43 /bin -> usr/bin +I: user script /srv/workspace/pbuilder/32063/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -635,7 +667,7 @@ Get: 508 http://deb.debian.org/debian unstable/main armhf dh-octave all 1.8.0 [22.7 kB] Get: 509 http://deb.debian.org/debian unstable/main armhf octave-struct armhf 1.0.18-3+b1 [31.7 kB] Get: 510 http://deb.debian.org/debian unstable/main armhf octave-parallel armhf 4.0.2-1 [183 kB] -Fetched 177 MB in 17s (10.3 MB/s) +Fetched 177 MB in 4s (43.0 MB/s) debconf: delaying package configuration, since apt-utils is not installed Selecting previously unselected package autoconf-archive. (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 19466 files and directories currently installed.) @@ -2731,7 +2763,11 @@ Building tag database... -> Finished parsing the build-deps I: Building the package -I: Running cd /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-genchanges -S > ../octave-level-set_0.3.1~git.2019.04.13-7_source.changes +I: user script /srv/workspace/pbuilder/32063/tmp/hooks/A99_set_merged_usr starting +Not re-configuring usrmerge for unstable +I: user script /srv/workspace/pbuilder/32063/tmp/hooks/A99_set_merged_usr finished +hostname: Name or service not known +I: Running cd /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-genchanges -S > ../octave-level-set_0.3.1~git.2019.04.13-7_source.changes dpkg-buildpackage: info: source package octave-level-set dpkg-buildpackage: info: source version 0.3.1~git.2019.04.13-7 dpkg-buildpackage: info: source distribution unstable @@ -2783,12 +2819,12 @@ g++ -c -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security Utils.cpp -o Utils.o CXXFLAGS="-g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security" /usr/bin/mkoctfile --verbose internal_fastmarching.cpp FastMarching.o Utils.o -o __levelset_internal_fastmarching.oct CXXFLAGS="-g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security" /usr/bin/mkoctfile --verbose internal_init_narrowband.cpp FastMarching.o Utils.o -o __levelset_internal_init_narrowband.oct +g++ -c -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security internal_fastmarching.cpp -o /tmp/oct-e8zrsa.o +g++ -c -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security internal_init_narrowband.cpp -o /tmp/oct-GgSVJp.o CXXFLAGS="-g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security" /usr/bin/mkoctfile --verbose geomElements.cpp FastMarching.o Utils.o -o __levelset_geomElements.oct CXXFLAGS="-g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security" /usr/bin/mkoctfile --verbose geomBoundary.cpp FastMarching.o Utils.o -o __levelset_geomBoundary.oct -g++ -c -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security internal_fastmarching.cpp -o /tmp/oct-tDLFSS.o -g++ -c -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security internal_init_narrowband.cpp -o /tmp/oct-qlwW6i.o -g++ -c -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security geomElements.cpp -o /tmp/oct-7LiveQ.o -g++ -c -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security geomBoundary.cpp -o /tmp/oct-W0kuc3.o +g++ -c -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security geomBoundary.cpp -o /tmp/oct-6fohNF.o +g++ -c -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security geomElements.cpp -o /tmp/oct-lIwAdk.o In file included from /usr/include/arm-linux-gnueabihf/c++/13/bits/c++allocator.h:33, from /usr/include/c++/13/bits/allocator.h:46, from /usr/include/c++/13/string:43, @@ -2844,6 +2880,9 @@ /usr/include/c++/13/bits/new_allocator.h:151:55: note: returned from 'void* operator new(std::size_t)' 151 | return static_cast<_Tp*>(_GLIBCXX_OPERATOR_NEW(__n * sizeof(_Tp))); | ^ +g++ -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -o __levelset_internal_init_narrowband.oct FastMarching.o Utils.o /tmp/oct-GgSVJp.o -shared -Wl,-Bsymbolic -Wl,-z,relro -L/usr/lib/arm-linux-gnueabihf -shared -Wl,-Bsymbolic -flto=auto -ffat-lto-objects -Wl,-z,relro +CXXFLAGS="-g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security" /usr/bin/mkoctfile --verbose geomGamma.cpp FastMarching.o Utils.o -o __levelset_geomGamma.oct +g++ -c -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security geomGamma.cpp -o /tmp/oct-VMeQKP.o In file included from /usr/include/c++/13/map:62, from FastMarching.hpp:60, from Utils.hpp:24, @@ -2852,7 +2891,6 @@ /usr/include/c++/13/bits/stl_tree.h:2458:7: note: parameter passing for argument of type 'std::_Rb_tree, std::pair, IntersectionPoint>, std::_Select1st, IntersectionPoint> >, std::less >, std::allocator, IntersectionPoint> > >::const_iterator' changed in GCC 7.1 2458 | _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>:: | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -g++ -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -o __levelset_internal_init_narrowband.oct FastMarching.o Utils.o /tmp/oct-qlwW6i.o -shared -Wl,-Bsymbolic -Wl,-z,relro -L/usr/lib/arm-linux-gnueabihf -shared -Wl,-Bsymbolic -flto=auto -ffat-lto-objects -Wl,-z,relro In file included from /usr/include/c++/13/map:63: In member function 'std::map<_Key, _Tp, _Compare, _Alloc>::iterator std::map<_Key, _Tp, _Compare, _Alloc>::emplace_hint(const_iterator, _Args&& ...) [with _Args = {const std::pair, IntersectionPoint>&}; _Key = std::pair; _Tp = IntersectionPoint; _Compare = std::less >; _Alloc = std::allocator, IntersectionPoint> >]', inlined from 'std::__enable_if_t, _Pair>::value, std::pair, std::_Select1st >, _Compare, typename __gnu_cxx::__alloc_traits<_Allocator>::rebind >::other>::iterator, bool> > std::map<_Key, _Tp, _Compare, _Alloc>::insert(_Pair&&) [with _Pair = const std::pair, IntersectionPoint>&; _Key = std::pair; _Tp = IntersectionPoint; _Compare = std::less >; _Alloc = std::allocator, IntersectionPoint> >]' at /usr/include/c++/13/bits/stl_map.h:860:27, @@ -2862,17 +2900,16 @@ | ~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~ 641 | std::forward<_Args>(__args)...); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -CXXFLAGS="-g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security" /usr/bin/mkoctfile --verbose geomGamma.cpp FastMarching.o Utils.o -o __levelset_geomGamma.oct -g++ -c -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security geomGamma.cpp -o /tmp/oct-2dc2Sm.o -g++ -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -o __levelset_internal_fastmarching.oct FastMarching.o Utils.o /tmp/oct-tDLFSS.o -shared -Wl,-Bsymbolic -Wl,-z,relro -L/usr/lib/arm-linux-gnueabihf -shared -Wl,-Bsymbolic -flto=auto -ffat-lto-objects -Wl,-z,relro +g++ -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -o __levelset_geomElements.oct FastMarching.o Utils.o /tmp/oct-lIwAdk.o -shared -Wl,-Bsymbolic -Wl,-z,relro -L/usr/lib/arm-linux-gnueabihf -shared -Wl,-Bsymbolic -flto=auto -ffat-lto-objects -Wl,-z,relro +g++ -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -o __levelset_internal_fastmarching.oct FastMarching.o Utils.o /tmp/oct-e8zrsa.o -shared -Wl,-Bsymbolic -Wl,-z,relro -L/usr/lib/arm-linux-gnueabihf -shared -Wl,-Bsymbolic -flto=auto -ffat-lto-objects -Wl,-z,relro CXXFLAGS="-g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security" /usr/bin/mkoctfile --verbose nbFromGeom.cpp FastMarching.o Utils.o -o __levelset_nbFromGeom.oct -g++ -c -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security nbFromGeom.cpp -o /tmp/oct-bAlyGi.o -g++ -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -o __levelset_geomElements.oct FastMarching.o Utils.o /tmp/oct-7LiveQ.o -shared -Wl,-Bsymbolic -Wl,-z,relro -L/usr/lib/arm-linux-gnueabihf -shared -Wl,-Bsymbolic -flto=auto -ffat-lto-objects -Wl,-z,relro +g++ -c -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security nbFromGeom.cpp -o /tmp/oct-ZEtuOR.o CXXFLAGS="-g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security" /usr/bin/mkoctfile --verbose internal_mesh.cpp FastMarching.o Utils.o -o __levelset_internal_mesh.oct -g++ -c -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security internal_mesh.cpp -o /tmp/oct-ZnYyQL.o -g++ -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -o __levelset_geomBoundary.oct FastMarching.o Utils.o /tmp/oct-W0kuc3.o -shared -Wl,-Bsymbolic -Wl,-z,relro -L/usr/lib/arm-linux-gnueabihf -shared -Wl,-Bsymbolic -flto=auto -ffat-lto-objects -Wl,-z,relro +g++ -c -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security internal_mesh.cpp -o /tmp/oct-0TTiB4.o +g++ -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -o __levelset_geomBoundary.oct FastMarching.o Utils.o /tmp/oct-6fohNF.o -shared -Wl,-Bsymbolic -Wl,-z,relro -L/usr/lib/arm-linux-gnueabihf -shared -Wl,-Bsymbolic -flto=auto -ffat-lto-objects -Wl,-z,relro CXXFLAGS="-g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security" /usr/bin/mkoctfile --verbose upwindGrad.cpp FastMarching.o Utils.o -o __levelset_upwindGrad.oct -g++ -c -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security upwindGrad.cpp -o /tmp/oct-xkZWP2.o +g++ -c -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security upwindGrad.cpp -o /tmp/oct-YEq9h2.o +g++ -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -o __levelset_nbFromGeom.oct FastMarching.o Utils.o /tmp/oct-ZEtuOR.o -shared -Wl,-Bsymbolic -Wl,-z,relro -L/usr/lib/arm-linux-gnueabihf -shared -Wl,-Bsymbolic -flto=auto -ffat-lto-objects -Wl,-z,relro In file included from /usr/include/c++/13/vector:72, from /usr/include/c++/13/functional:64, from /usr/include/octave-8.4.0/octave/../octave/oct-sort.h:92, @@ -2892,14 +2929,13 @@ /usr/include/c++/13/bits/vector.tcc:123:28: note: parameter passing for argument of type '__gnu_cxx::__normal_iterator >' changed in GCC 7.1 123 | _M_realloc_insert(end(), std::forward<_Args>(__args)...); | ~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -g++ -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -o __levelset_upwindGrad.oct FastMarching.o Utils.o /tmp/oct-xkZWP2.o -shared -Wl,-Bsymbolic -Wl,-z,relro -L/usr/lib/arm-linux-gnueabihf -shared -Wl,-Bsymbolic -flto=auto -ffat-lto-objects -Wl,-z,relro -g++ -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -o __levelset_nbFromGeom.oct FastMarching.o Utils.o /tmp/oct-bAlyGi.o -shared -Wl,-Bsymbolic -Wl,-z,relro -L/usr/lib/arm-linux-gnueabihf -shared -Wl,-Bsymbolic -flto=auto -ffat-lto-objects -Wl,-z,relro -g++ -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -o __levelset_geomGamma.oct FastMarching.o Utils.o /tmp/oct-2dc2Sm.o -shared -Wl,-Bsymbolic -Wl,-z,relro -L/usr/lib/arm-linux-gnueabihf -shared -Wl,-Bsymbolic -flto=auto -ffat-lto-objects -Wl,-z,relro -g++ -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -o __levelset_internal_mesh.oct FastMarching.o Utils.o /tmp/oct-ZnYyQL.o -shared -Wl,-Bsymbolic -Wl,-z,relro -L/usr/lib/arm-linux-gnueabihf -shared -Wl,-Bsymbolic -flto=auto -ffat-lto-objects -Wl,-z,relro +g++ -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -o __levelset_geomGamma.oct FastMarching.o Utils.o /tmp/oct-VMeQKP.o -shared -Wl,-Bsymbolic -Wl,-z,relro -L/usr/lib/arm-linux-gnueabihf -shared -Wl,-Bsymbolic -flto=auto -ffat-lto-objects -Wl,-z,relro +g++ -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -o __levelset_upwindGrad.oct FastMarching.o Utils.o /tmp/oct-YEq9h2.o -shared -Wl,-Bsymbolic -Wl,-z,relro -L/usr/lib/arm-linux-gnueabihf -shared -Wl,-Bsymbolic -flto=auto -ffat-lto-objects -Wl,-z,relro +g++ -I/usr/include/octave-8.4.0/octave/.. -I/usr/include/octave-8.4.0/octave -pthread -fopenmp -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -g -O2 -ffile-prefix-map=/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -o __levelset_internal_mesh.oct FastMarching.o Utils.o /tmp/oct-0TTiB4.o -shared -Wl,-Bsymbolic -Wl,-z,relro -L/usr/lib/arm-linux-gnueabihf -shared -Wl,-Bsymbolic -flto=auto -ffat-lto-objects -Wl,-z,relro make[1]: Leaving directory '/build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/src' copyfile /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/./src/__levelset_geomBoundary.oct /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/./src/__levelset_geomElements.oct /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/./src/__levelset_geomGamma.oct /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/./src/__levelset_internal_fastmarching.oct /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/./src/__levelset_internal_init_narrowband.oct /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/./src/__levelset_internal_mesh.oct /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/./src/__levelset_nbFromGeom.oct /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/./src/__levelset_upwindGrad.oct /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/./inst/arm-unknown-linux-gnueabihf-api-v58 -octave-help-P6UUwQ:150: missing @table argument -octave-help-P6UUwQ:150: missing @table argument +octave-help-b54vRi:150: missing @table argument +octave-help-b54vRi:150: missing @table argument warning: doc_cache_create: unusable help text found in file 'ls_sign_colourmap' warning: called from doc_cache_create>handle_function at line 98 column 5 @@ -2912,10 +2948,10 @@ pkg at line 619 column 9 /usr/share/dh-octave/install-pkg.m at line 38 column 1 -octave-help-vuWyfG:145: @code expected braces -octave-help-vuWyfG:149: @code expected braces -octave-help-vuWyfG:145: @code expected braces -octave-help-vuWyfG:149: @code expected braces +octave-help-Uwm738:145: @code expected braces +octave-help-Uwm738:149: @code expected braces +octave-help-Uwm738:145: @code expected braces +octave-help-Uwm738:149: @code expected braces warning: doc_cache_create: unusable help text found in file 'so_example_problem' warning: called from doc_cache_create>handle_function at line 98 column 5 @@ -2933,44 +2969,347 @@ Checking package... Run the unit tests... Checking m files ... -[inst/ls_enforce.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_enforce.m +[inst/ls_genbasic.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_genbasic.m +***** shared x, y, XX, YY, XXX, YYY, ZZZ + n = 121; + x = linspace (-5, 7, n); + y = linspace (-7, 5, n); + [XX, YY] = meshgrid (x, y); + [XXX, YYY, ZZZ] = ndgrid (x, y, x); ***** error - ls_enforce (1, 2) -***** error - ls_enforce (1, 2, 3, 4) -***** error - ls_enforce (1, "inside", [1, 2]); -***** error - ls_enforce (1, "foo", true); -***** error - ls_enforce (1, NA, false); + ls_genbasic (); +***** error + ls_genbasic (1, 2); +***** error + ls_genbasic ("sphere"); +***** error + ls_genbasic (XX, YY, "unknown"); ***** test - n = 100; + ls_genbasic (x, "sphere", 0, 1); + ls_genbasic (x', "sphere", 0, 1); + ls_genbasic (XX, YY, "sphere", [0, 0], 1); + ls_genbasic (0, 1, "sphere", [0, 0], 1); +***** error + ls_genbasic (XX, YY, "sphere"); +***** error + ls_genbasic (XX, YY, "sphere", 1); +***** error + ls_genbasic (XX, YY, "sphere", 1, 2, 3); +***** error + ls_genbasic (XX, YY, "sphere", [1, 2, 3], 1); +***** error + ls_genbasic (XX, YY, "sphere", [1, 2], [1, 2, 3]); +***** test + assert (ls_genbasic (XX, YY, "sphere", [1, -1], 1), ... + ls_genbasic (XX, YY, "sphere", [1, -1], [1, 1])); +***** test + c = [1; -1; 2]; + r = [1; 2; 0.6]; + tol = 0.4; + phi1 = ls_genbasic (XXX, YYY, ZZZ, "sphere", c, r); + phi2 = ls_genbasic (XXX, YYY, ZZZ, "sphere", c, min (r) - tol); + assert (ls_issubset (phi2, phi1)); + coords = {XXX, YYY, ZZZ}; + for i = 1 : length (c) + assert (ls_disjoint (phi1, ... + coords{i} - (c(i) - r(i)), ... + c(i) + r(i) - coords{i})); + assert (~ls_disjoint (phi1 - tol, coords{i} - (c(i) - r(i)))); + assert (~ls_disjoint (phi1 - tol, c(i) + r(i) - coords{i})); + endfor +***** error + ls_genbasic (XX, YY, "box", 1); +***** error + ls_genbasic (XX, YY, "box", 1, 2, 3); +***** error + ls_genbasic (XX, YY, "box", [1, 2, 3], [1, 2]); +***** error + ls_genbasic (XX, YY, "box", [1; 2], [1, 2, 3]); +***** test + assert (ls_equal (ls_genbasic (x, "box", -1, 2), abs (x - 0.5) - 1.5)); + assert (ls_equal (ls_genbasic (x, "box", 2, -1), abs (x - 0.5) - 1.5)); +***** test + a = [2; -3; 1]; + b = [0; 2; -1]; + tol = 0.2; + phi1 = ls_genbasic (XXX, YYY, ZZZ, "box", a, b); + phi2 = ls_genbasic (XXX, YYY, ZZZ, "box", b, a); + assert (phi1, phi2); + coords = {XXX, YYY, ZZZ}; + for i = 1 : length (coords) + assert (ls_disjoint (phi1, ... + coords{i} - min (a(i), b(i)), ... + max (a(i), b(i)) - coords{i})); + assert (~ls_disjoint (phi1 - tol, coords{i} - min (a(i), b(i)))); + assert (~ls_disjoint (phi1 - tol, max (a(i), b(i)) - coords{i})); + endfor +***** error + ls_genbasic (XX, YY, "half", 1); +***** error + ls_genbasic (XX, YY, "half", 1, 2, 3); +***** error + ls_genbasic (XX, YY, "half", [1, 2, 3], [1, 2]); +***** error + ls_genbasic (XX, YY, "half", [1; 2], [1, 2, 3]); +***** test + p = [0, 2, 1]; + + phi = ls_genbasic (XXX, YYY, ZZZ, "half", p, [0; 0; 1]); + assert (ls_equal (phi, 1 - ZZZ)); + + normal = [1; 2; -0.5]; + phi1 = ls_genbasic (XXX, YYY, ZZZ, "half", p, normal); + phi2 = ls_genbasic (XXX, YYY, ZZZ, "half", p, 2 * normal); + assert (ls_equal (phi1, phi2)); + + phi = ls_genbasic (XX, YY, "half", [0, 0], [1, -1]); + assert (ls_equal (phi, YY - XX)); +***** demo + n = 200; + x = linspace (-7, 7, n); + [XX, YY] = meshgrid (x, x); + + phi1 = ls_genbasic (XX, YY, "box", [-5, -3], [3, 6]); + phi2 = ls_genbasic (XX, YY, "sphere", [-1; 1], 2); + phi3 = ls_genbasic (XX, YY, "sphere", [0; 0], [6, 1]); + phi4 = ls_genbasic (XX, YY, "half", [3, -3], [1, -2]) / 8; + + phi = ls_union (ls_setdiff (phi1, phi2), phi3, phi4); + figure (); + hold ("on"); + imagesc (x, x, phi); + set (gca (), "ydir", "normal"); + ls_sign_colourmap (); + contour (XX, YY, phi, [0, 0], "k"); + hold ("off"); + axis ("equal"); +23 tests, 23 passed, 0 known failure, 0 skipped +[inst/ls_find_geometry.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_find_geometry.m +***** error + ls_find_geometry () +***** error + ls_find_geometry (1, 2, 3, 4) +***** error + ls_find_geometry (resize (zeros (8, 1), [2, 2, 2])) +***** error + ls_find_geometry ([1, -1, 1]) +***** error + ls_find_geometry ([0, 1; -1, -1]) +***** error + ls_find_geometry ([-1, NA; -1, -1]) +***** function verifyGeometry (phi, geom) + sz = size (phi); + nNode = prod (sz); + L = sz(1); + M = sz(2); + nElem = (L - 1) * (M - 1); + assert (geom.dim, sz); + + % Basic properties of the elem field. + assert (geom.elem.n, nElem); + assert (size (geom.elem.nodelist), [nElem, 4]); + assert (all (geom.elem.type(geom.elem.index.inner) == -1)); + assert (all ((geom.elem.type(geom.elem.index.bdry) == 0))); + assert (all ((geom.elem.type(geom.elem.index.outer) == 1))); + % Order of the nodes in nodelist. + assert (geom.elem.nodelist(1, :), [L+2, 2, 1, L+1]); + % Correct classification of inner/outer/bdry elements. + assert (all (phi(geom.elem.nodelist(geom.elem.index.inner, :))(:) < 0)); + assert (all (phi(geom.elem.nodelist(geom.elem.index.outer, :))(:) > 0)); + bdryPhis = phi(geom.elem.nodelist(geom.elem.index.bdry, :)); + bdryPhis = sort (bdryPhis, 2); + assert (all (bdryPhis(:, 1) < 0) && all (bdryPhis(:, end) > 0)); + + % Each boundary element should have two or four intersected edges. + % Also verify that the start/endEdge fields of the internal information + % match up to the points in question. + for i = 1 : geom.bdryel.n + empty = length (find (isna (geom.bdryel.edges(i, :)))); + assert (empty == 2 || empty == 0); + for j = 1 : length (geom.internal.bdryelSegments{i}) + s = geom.internal.bdryelSegments{i}{j}; + assert (geom.bdryel.edges(i, s.startEdge) == s.startPt); + assert (geom.bdryel.edges(i, s.endEdge) == s.endPt); + endfor + endfor + + % Run through gamma components and verify that geom.ispts.onedge matches. + for i = 1 : geom.gamma.n + c = geom.gamma.ispts{i}; + c(end + 1) = c(1); + for j = 1 : length (c) - 1 + cur = c(j); + next = c(j + 1); + bdryel = geom.ispts.onedge(cur, 1, 1); + assert (geom.ispts.onedge(next, 2, 1), bdryel); + assert (geom.bdryel.edges(bdryel, geom.ispts.onedge(cur, 1, 2)), cur); + assert (geom.bdryel.edges(bdryel, geom.ispts.onedge(next, 2, 2)), next); + + edgeForward = geom.ispts.onedge(cur, 1, 3); + assert (geom.bedges.ispts(edgeForward, 1), cur); + assert (geom.bedges.ispts(edgeForward, 2), next); + + assert (geom.ispts.gammachain(cur, 1), next); + assert (geom.ispts.gammachain(next, 2), cur); + endfor + endfor + + % Verify that the ordering of points in bedges matches the onedge + % information about start / end points in each boundary element. + for i = 1 : geom.bedges.n + assert (geom.ispts.onedge(geom.bedges.ispts(i, 1), 1, 1), ... + geom.ispts.onedge(geom.bedges.ispts(i, 2), 2, 1)); + assert (geom.ispts.onedge(geom.bedges.ispts(i, 1), 1, 3), i); + assert (geom.ispts.onedge(geom.bedges.ispts(i, 2), 2, 3), i); + endfor +***** endfunction +***** test + phis = ls_get_tests (); + hs = [0.1, 0.5, 1, 1.5]; + for i = 1 : length (phis) + for h = hs + for s = [-1, 1] + cur = phis{i} * s; + phi = ls_normalise (cur, h); + geom = ls_find_geometry (phi, h); + verifyGeometry (phi, geom); + endfor + endfor + endfor +***** test + phi = ones (4, 4); + phi(2 : 3, 2 : 3) = [Inf, -1; -Inf, 2]; + g = ls_find_geometry (phi, 0.1, 0.01); + + ind = find (g.elem.index.bdry == 5); + assert (size (ind), [1, 1]); + edges = g.bdryel.edges(ind, :); + assert (all (~isna (edges))); + + assert (g.ispts.inout(edges, :), [7, 11; 7, 6; 10, 6; 10, 11]); + assert (g.ispts.frac(edges), [0.99; 0.5; 0.01; 1/3], sqrt (eps)); + assert (g.ispts.incoord(edges, :), ... + [0.099, 0; 0, -0.05; -0.001, 0; 0, 1/30], sqrt (eps)); +***** error + phi = [-1, -1; 1, 1]; + ls_find_geometry (phi); +***** test + phi = ones (3, 3); + phi(2, 2) = -1; + geom = ls_find_geometry (phi); + + % Permute the component array such that it starts with the north point + % and then compare coordinates. Note that the "north" point is "south" + % in matrix interpretation and thus has "outindex" of 6. + assert (geom.gamma.n, 1); + c = geom.gamma.ispts{1}'; + while (geom.ispts.inout(c(1), 2) != 6) + c = [c(2 : end), c(1)]; + endwhile + assert (geom.ispts.incoord(c, :), ... + [0, 1/2; -1/2, 0; 0, -1/2; 1/2, 0], sqrt (eps)); +***** function checkBoundaryDirection (pts, dir) + pts(end + 1, :) = pts(1, :); + for i = 1 : length (pts) - 1 + a = [pts(i, :), 0]; + b = [pts(i + 1, :), 0]; + z = cross (a, b); + assert (z(1 : 2), [0, 0]); + assert (sign (z(3)), dir); + endfor +***** endfunction +***** test + n = 50; x = linspace (-10, 10, n); + h = x(2) - x(1); [XX, YY] = meshgrid (x, x); - circ2 = (XX.^2 + YY.^2 < 2^2); - circ8 = (XX.^2 + YY.^2 < 8^2); - phi = (XX.^2 + YY.^2 - 5^2); + phi = ls_setdiff (ls_genbasic (XX, YY, "sphere", [0, 0], 8), ... + ls_genbasic (XX, YY, "sphere", [0, 0], 4)); + phi = ls_normalise (phi, h); + geom = ls_find_geometry (phi, h); + geom = ls_absolute_geom (geom, XX, YY); - phi2 = ls_enforce (phi, "inside", circ8); - assert (ls_equal (phi2, phi)); - phi2 = ls_enforce (phi, "inside", circ2); - assert (ls_check (phi2, "inside", circ2)); + assert (geom.gamma.n, 2); + len1 = length (geom.gamma.ispts{1}); + len2 = length (geom.gamma.ispts{2}); + if (len1 < len2) + outer = geom.gamma.ispts{2}; + inner = geom.gamma.ispts{1}; + else + assert (len1 > len2); + outer = geom.gamma.ispts{1}; + inner = geom.gamma.ispts{2}; + endif - phi2 = ls_enforce (phi, "contain", circ2); - assert (ls_equal (phi2, phi)); - phi2 = ls_enforce (phi, "contain", circ8); - assert (ls_check (phi2, "contain", circ8)); + checkBoundaryDirection (geom.ispts.coord(outer, :), 1); + checkBoundaryDirection (geom.ispts.coord(inner, :), -1); +***** test + phi = ones (4, 4); + phi(2, 2) = -1; + phi(3, 3) = -1; - phi2 = ls_enforce (phi, "outside", ~circ8); - assert (ls_equal (phi2, phi)); - phi2 = ls_enforce (phi, "outside", ~circ2); - ls_check (phi2, "outside", ~circ2); - phi2 = ls_enforce (phi, "outside", circ2); - ls_check (phi2, "outside", circ2); -6 tests, 6 passed, 0 known failure, 0 skipped + geom = ls_find_geometry (phi); + assert (geom.gamma.n, 2); + geom = ls_find_geometry (-phi); + assert (geom.gamma.n, 1); + + % Now also try with other "kind" of narrow pair. + phi = phi(:, end : -1 : 1); + geom = ls_find_geometry (phi); + assert (geom.gamma.n, 2); + geom = ls_find_geometry (-phi); + assert (geom.gamma.n, 1); +***** demo + n = 15; + x = linspace (-10, 10, n); + h = x(2) - x(1); + [XX, YY] = meshgrid (x, x); + + r1 = sqrt (2) * 2.9; + r2 = 3; + phi = ls_union (ls_genbasic (XX, YY, "sphere", [-3, -3], r1), ... + ls_genbasic (XX, YY, "sphere", [3, 3], r1), ... + ls_genbasic (XX, YY, "sphere", [-5, 5], r2), ... + ls_genbasic (XX, YY, "sphere", [5, -5], r2)); + + phi = ls_normalise (phi, h); + g = ls_find_geometry (phi, h, 0.2); + g = ls_absolute_geom (g, XX, YY); + + figure (); + hold ("on"); + + for i = 1 : size (g.elem.nodelist, 1) + nodes = g.elem.nodelist(i, :); + switch (g.elem.type(i)) + case -1 + colour = [0.5, 0.5, 1]; + case 0 + colour = [1, 0.5, 0.5]; + case 1 + colour = [0.8, 0.8, 0.8]; + endswitch + patch (XX(nodes), YY(nodes), colour); + endfor + + plot (g.ispts.coord(:, 1), g.ispts.coord(:, 2), "k.", "MarkerSize", 8); + for i = 1 : g.gamma.n + pts = g.gamma.ispts{i}; + pts(end + 1) = pts(1); + plot (g.ispts.coord(pts, 1), g.ispts.coord(pts, 2), "k-", "LineWidth", 2); + endfor + + contour (XX, YY, phi, [0, 0], "g"); + + axis ([min(x), max(x), min(x), max(x)]); + axis ("equal"); + grid ("on"); + set (gca (), "xtick", x, "ytick", x, "xticklabel", "", "yticklabel", ""); + hold ("off"); +12 tests, 12 passed, 0 known failure, 0 skipped [inst/fastmarching.m] >>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/fastmarching.m ***** error @@ -3116,7 +3455,7 @@ fastmarching at line 110 column 19 __test__ at line 5 column 5 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 22 column 31 + /tmp/tmp.V4echIb6Q7 at line 30 column 31 ***** test u0 = [0, NA; Inf, 2]; @@ -3128,14 +3467,14 @@ fastmarching at line 110 column 19 __test__ at line 5 column 5 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 22 column 31 + /tmp/tmp.V4echIb6Q7 at line 30 column 31 warning: found too far alive point in fast marching, d = -8.000000 warning: called from fastmarching at line 110 column 19 __test__ at line 5 column 5 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 22 column 31 + /tmp/tmp.V4echIb6Q7 at line 30 column 31 ***** test u0 = [0, NA, NA, NA, 0.1; ... @@ -3175,14 +3514,14 @@ p(1), pLogN(1)); assert (p(1), 1, 1e-1); assert (pLogN(1), 1, 1e-1); -n = 101: t = 0.155 s -n = 201: t = 0.657 s -n = 501: t = 4.481 s -n = 1001: t = 19.519 s -n = 2001: t = 87.767 s +n = 101: t = 0.059 s +n = 201: t = 0.248 s +n = 501: t = 1.718 s +n = 1001: t = 7.749 s +n = 2001: t = 35.466 s Exponents: - O(n): 1.06 - O(n log n): 0.98 + O(n): 1.07 + O(n log n): 0.99 ***** test T = 1.6; timeSteps = 10000; @@ -3339,538 +3678,219 @@ imshow (u); title ("Solved Maze. Blue: Walls, Red: Unreachable, Yellow: Start."); 16 tests, 16 passed, 0 known failure, 0 skipped -[inst/upwind_gradient_norm.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/upwind_gradient_norm.m +[inst/ls_time_step.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_time_step.m ***** error - upwind_gradient_norm () -***** error - upwind_gradient_norm (1, 2, 3, 4) + ls_time_step (1, 2) +***** error + ls_time_step (1, 2, 3, 4, 5, 6) ***** error - upwind_gradient_norm ([1, 1], [2, 2], [3, 3]) -***** error - upwind_gradient_norm ([1, 1], [2, 2, 2]) -***** error - upwind_gradient_norm ([1, 1], [2, 2, 2], 5) + ls_time_step (1, 2, 3, 4, [5, 5]) +***** error + ls_time_step ([1; 1], [2, 2], [3, 3, 3]) +***** error + ls_time_step ([1, 1], 1, [2, 2], [3, 3, 3]) +***** error + ls_time_step (ones (2, 2), 1, 1) ***** test - phi = [0, 2, 3]; - fPos = ones (size (phi)); + n = 100; + x = linspace (0, 1, n); + h = x(2) - x(1); - % Propagate the original phi to the right. This should result - % in the *backward* difference to be used in the middle. - g = upwind_gradient_norm (phi); - assert (g(2), 2); - gp = upwind_gradient_norm (phi, fPos); - assert (gp, g); - gp = upwind_gradient_norm (phi, 0.5); - assert (gp, 2 * g); - gp = upwind_gradient_norm (phi, fPos, 0.5); - assert (gp, 2 * g); + phi0 = sin (x); + fPos = ones (size (phi0)); - % Propagate to the left for the reverse effect. - g = upwind_gradient_norm (phi, -fPos); - assert (g(2), 1); + % Single time step, moving exactly one grid step. + phit = ls_time_step (1, phi0, fPos); + assert (phit(2 : end), phi0(1 : end - 1)); - % Propagate -phi, which again turns everything around. - g = upwind_gradient_norm (-phi, fPos); - assert (g(2), 1); - g = upwind_gradient_norm (-phi, -fPos); - assert (g(2), 2); -***** test - n = 50; - x = linspace (-1, 1, n); - h = x(2) - x(1); - [XX, YY, ZZ] = ndgrid (x, x, x); + % t = 1 should correspond to the previous result, and t = 2 + % shifts one more time step. However, due to boundary effects, + % we have to exclude some elements in the comparisons. + phitArr = ls_time_step ([1, 2], 0.5, phi0, fPos); + assert (size (phitArr), [2, 1]); + assert (phitArr{1}(3 : end), phit(3 : end), 1e-4); + assert (phitArr{2}(5 : end), phi0(3 : end - 2), 1e-4); - phi = XX.^2 + YY.^2 + ZZ.^2; - g = upwind_gradient_norm (phi, h); - - r = sqrt (phi); - assert (g, 2 * r, 0.1); -7 tests, 7 passed, 0 known failure, 0 skipped -[inst/ls_complement.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_complement.m -***** error - ls_complement () -***** error - ls_complement (1, 2) + % Try out movement in the other direction. + phit = ls_time_step (0.5, 0.1, phi0, -fPos, 0.5); + assert (phit(1 : end - 4), phi0(2 : end - 3), 1e-4); +***** function compareFastMarching (t, phi0, F, h, tol) + phit = ls_time_step (t, phi0, F, h); + d = ls_solve_stationary (phi0, F, h); + phit_fm = ls_extract_solution (t, d, phi0, F); + + sd1 = ls_signed_distance (phit, h); + sd2 = ls_signed_distance (phit_fm, h); + assert (sd1, sd2, tol); +***** endfunction ***** test - n = 50; - x = linspace (-10, 10, n); + warning ("off", "level-set:fast-marching:too-far-alive"); + + n = 100; + x = linspace (-5, 5, n); h = x(2) - x(1); [XX, YY] = meshgrid (x, x); - phi1 = (XX - 2).^2 + (YY - 2).^2 - 2^2; - phi2 = (XX + 2).^2 + (YY + 2).^2 - 2^2; + phi0 = ls_genbasic (XX, YY, "sphere", [0, 0], [3, 1.5]); + F = ones (size (phi0)); + compareFastMarching (0.5, phi0, F, h, h / 2); + compareFastMarching (1.5, phi0, F, h, h / 2); - assert (ls_disjoint (phi1, ls_complement (phi1))); - assert (ls_disjoint (phi2, ls_complement (phi2))); + phi0 = ls_genbasic (XX, YY, "box", [-3, -3], [3, 3]); + F = YY / 5; + compareFastMarching (1, phi0, F, h, h); - assert (~ls_disjoint (phi1, ls_complement (phi2))); - assert (~ls_disjoint (phi2, ls_complement (phi1))); + F = ones (size (phi0)); + compareFastMarching (1, phi0, F, h, h / 2); - sd1 = ls_signed_distance (ls_complement (phi1), h); - sd2 = ls_complement (ls_signed_distance (phi1, h)); - assert (sd1, sd2, sqrt (eps)); -3 tests, 3 passed, 0 known failure, 0 skipped -[inst/ls_union.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_union.m -***** error - ls_union () -***** error - ls_union (1, -2, [1, 2]) + phi0 = ls_genbasic (XX, YY, "sphere", [0, 0], 3); + F = sin (XX .* YY); + compareFastMarching (1, phi0, F, h, h); ***** test - n = 50; - x = linspace (-10, 10, n); - [XX, YY] = meshgrid (x, x); - - phi1 = (XX - 3).^2 + (YY - 3).^2 - 2^2; - phi2 = (XX + 3).^2 + (YY + 3).^2 - 2^2; - phi3 = XX.^2 + YY.^2 - 2^2; + warning ("off", "level-set:fast-marching:increased-distance"); - phi = ls_union (phi1, phi2, phi3); - assert (ls_issubset (phi1, phi)); - assert (ls_issubset (phi2, phi)); - assert (ls_issubset (phi3, phi)); + n = 50; + x = linspace (-5, 5, n); + h = x(2) - x(1); + [XX, YY, ZZ] = ndgrid (x, x, x); - assert (ls_union (phi3), phi3); + phi0 = ls_genbasic (XX, YY, ZZ, "sphere", [0, 0, 0], 3); + F = ones (size (phi0)); + compareFastMarching (1, phi0, F, h, h / 2); + compareFastMarching (1, phi0, -F, h, h / 2); ***** demo - n = 100; - x = linspace (-7, 7, n); + n = 500; + x = linspace (-5, 5, n); + h = x(2) - x(1); [XX, YY] = meshgrid (x, x); - phi1 = (XX - 2 * cos (7/6 * pi)).^2 + (YY - 2 * sin (7/6 * pi)).^2 - 3^2; - phi2 = (XX - 2 * cos (11/6 * pi)).^2 + (YY - 2 * sin (11/6 * pi)).^2 - 3^2; - phi3 = XX.^2 + (YY - 2).^2 - 3^2; - phi = ls_union (phi1, phi2, phi3); + F = sin (XX .* YY); + phi0 = ls_genbasic (XX, YY, "sphere", [0, 0], 3); + phit = ls_time_step ([0.5, 1], phi0, F, h); figure (); - subplot (1, 2, 1); hold ("on"); - contour (XX, YY, phi1, [0, 0], "k"); - contour (XX, YY, phi2, [0, 0], "k"); - contour (XX, YY, phi3, [0, 0], "k"); - hold ("off"); + imagesc (x, x, F); axis ("equal"); - - subplot (1, 2, 2); - hold ("on"); - imagesc (x, x, phi); set (gca (), "ydir", "normal"); ls_sign_colourmap (); - contour (XX, YY, phi, [0, 0], "k"); + contour (XX, YY, phi0, [0, 0], "k", "LineWidth", 2); + contour (XX, YY, phit{1}, [0, 0], "k", "LineWidth", 2); + contour (XX, YY, phit{2}, [0, 0], "k", "LineWidth", 2); hold ("off"); - axis ("equal"); -3 tests, 3 passed, 0 known failure, 0 skipped -[inst/ls_absolute_geom.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_absolute_geom.m -***** error - ls_absolute_geom (1, 2); -***** error - ls_absolute_geom (1, 2, 3, 4); -***** error - x = [-1, 1]; - [XX, YY, ZZ] = ndgrid (x); - ls_absolute_geom (struct (), XX, YY); -***** error - ls_absolute_geom (struct (), [-1, 0, 1], [0, 0, 0]); -***** error - ls_absolute_geom (struct (), zeros (3, 2), zeros (2, 2)); -5 tests, 5 passed, 0 known failure, 0 skipped -[inst/so_explore_descent.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/so_explore_descent.m -***** error - so_explore_descent (1); -***** error - so_explore_descent (1, 2, 3); -***** error - so_explore_descent (struct (), 2); -***** error - so_explore_descent ([2, 3], 2); -***** error <'fload' is not available> - pkg unload -nodeps parallel; - so_explore_descent ("foo", 2); -***** demo - pkg load parallel; - - data = struct (); - data.p = so_init_params (false); - data.p.vol = 10; - data.p.weight = 50; - - data.p.nSteps = 10; - data.figs = struct (); - data.figs.speed = figure (); - data.figs.exploreCosts = figure (); - - n = 100; - x = linspace (-10, 10, n); - h = x(2) - x(1); - data.g = struct ("x", x, "h", h); - - data = so_example_problem (data); - phi0 = ls_genbasic (data.g.x, "box", -3, 7); - - printf ("Computing descent...\n"); - f = tmpfile (); - d = data; - d.handler = struct (); - d = so_save_descent (f, struct (), d); - s = so_run_descent (data.p.nSteps, phi0, d); - printf ("Final cost: %.6d\n", s.cost); - - printf ("\nNow replaying...\n"); - init = @() data; - frewind (f); - so_explore_descent (f, init); - fclose (f); -5 tests, 5 passed, 0 known failure, 0 skipped -[inst/ls_disjoint.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_disjoint.m +9 tests, 9 passed, 0 known failure, 0 skipped +[inst/ls_enforce.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_enforce.m ***** error - ls_disjoint () -***** error - ls_disjoint (1, -2, [1, 2]) -***** test - assert (ls_disjoint ([-1, 0, 1], [0, 0, 0], [1, 0, -1])); - assert (~ls_disjoint ([Inf, -Inf, 1], [-1, -1, 1])); - assert (~ls_disjoint ([-1, -1, 1], [0, 0, 0], [1, -1, -1])); + ls_enforce (1, 2) +***** error + ls_enforce (1, 2, 3, 4) +***** error + ls_enforce (1, "inside", [1, 2]); +***** error + ls_enforce (1, "foo", true); +***** error + ls_enforce (1, NA, false); ***** test - n = 50; + n = 100; x = linspace (-10, 10, n); [XX, YY] = meshgrid (x, x); - phi1 = (XX - 2).^2 + (YY - 2).^2 - 2^2; - phi2 = (XX + 2).^2 + (YY + 2).^2 - 2^2; - phi3 = XX.^2 + YY.^2 - 2^2; - - assert (ls_disjoint (phi1, phi2)); - assert (~ls_disjoint (phi1, phi3)); - assert (~ls_disjoint (phi2, phi3)); - assert (~ls_disjoint (phi1, phi2, phi3)); -4 tests, 4 passed, 0 known failure, 0 skipped -[inst/ls_hausdorff_dist.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_hausdorff_dist.m -***** error - ls_hausdorff_dist (1) -***** error - ls_hausdorff_dist (1, 2, 3, 4) -***** error - ls_hausdorff_dist (1, 2, [3, 3]) -***** error - ls_hausdorff_dist (1, 2, "foo") -***** test - n = 50; - x = linspace (-5, 5, n); - h = x(2) - x(1); - [XX, YY] = meshgrid (x, x); - - phi1 = ls_genbasic (XX, YY, "sphere", [3, 0], 1); - phi2 = ls_genbasic (XX, YY, "sphere", [-2, 0], 2); - assert (ls_hausdorff_dist (phi1, phi2, h), 6, h); - - % Make sure that phi isn't a signed-distance fcn already. - % ls_genbasic should return the same, but make it explicit. - rSq = XX.^2 + YY.^2; - d = ls_hausdorff_dist (rSq - 4^2, rSq - 2^2, h); - assert (d, 2, h); - dWrong = ls_hausdorff_dist (rSq - 4^2, rSq - 2^2, "sd"); - assert (abs (d - dWrong) > 10 * h); - dRight = ls_hausdorff_dist (sqrt (rSq) - 4, sqrt (rSq) - 2, "sd"); - assert (dRight, d, h); -***** test - n = 200; - x = linspace (-5, 5, n); - h = x(2) - x(1); - [XX, YY] = meshgrid (x, x); + circ2 = (XX.^2 + YY.^2 < 2^2); + circ8 = (XX.^2 + YY.^2 < 8^2); + phi = (XX.^2 + YY.^2 - 5^2); - phiA = ls_genbasic (XX, YY, "sphere", [0, 0], 4); - phiInner = ls_genbasic (XX, YY, "sphere", [0, 0], 2); - phiB = ls_setdiff (phiA, phiInner); + phi2 = ls_enforce (phi, "inside", circ8); + assert (ls_equal (phi2, phi)); + phi2 = ls_enforce (phi, "inside", circ2); + assert (ls_check (phi2, "inside", circ2)); - d1 = ls_hausdorff_dist (phiA, phiB, h); - d2 = ls_hausdorff_dist (phiB, phiA, h); - assert (d1, d2); - assert (d1, 2, 2 * h); - dc = ls_hausdorff_dist (ls_complement (phiA), ... - ls_complement (phiB), h); - assert (dc, 4, 2 * h); + phi2 = ls_enforce (phi, "contain", circ2); + assert (ls_equal (phi2, phi)); + phi2 = ls_enforce (phi, "contain", circ8); + assert (ls_check (phi2, "contain", circ8)); - sdA = ls_signed_distance (phiA, h); - sdB = ls_signed_distance (phiB, h); - sdDiff = norm (sdA(:) - sdB(:), inf); - assert (abs (sdDiff - d1) > 10 * h); + phi2 = ls_enforce (phi, "outside", ~circ8); + assert (ls_equal (phi2, phi)); + phi2 = ls_enforce (phi, "outside", ~circ2); + ls_check (phi2, "outside", ~circ2); + phi2 = ls_enforce (phi, "outside", circ2); + ls_check (phi2, "outside", circ2); 6 tests, 6 passed, 0 known failure, 0 skipped -[inst/ls_distance_fcn.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_distance_fcn.m +[inst/ls_sign_colourmap.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_sign_colourmap.m +***** shared colours + colours = [1, 1, 1; 0, 0, 0; 1, 1, 1; 0, 0, 0]; ***** error - ls_distance_fcn () -***** error - ls_distance_fcn (1, 2, 3) -***** test - assert (ls_distance_fcn ([]), []); -***** test - n = 10; - x = linspace (-2, 2, n); - h = x(2) - x(1); - phi = abs (x) - 1; - - d = ls_distance_fcn (phi, h); - assert (d, max (phi, 0), sqrt (eps)); -***** test - n = 50; - x = linspace (-2, 2, n); - h = x(2) - x(1); - [XX, YY, ZZ] = ndgrid (x); - RRsq = XX.^2 + YY.^2 + ZZ.^2; - phi = RRsq - 1; - - d = ls_distance_fcn (phi, h); - assert (d, max (sqrt (RRsq) - 1, 0), h); -***** xtest - n = 500; - x = linspace (-10, 10, n); - h = x(2) - x(1); - - [XX, YY] = meshgrid (x, x); - phi = ls_genbasic (XX, YY, "sphere", [0, 0], 8); - - id = tic (); - d = ls_distance_fcn (phi, h); - time1 = toc (id); - - id = tic (); - sd = ls_signed_distance (phi, h); - time2 = toc (id); - - assert (d, max (sd, 0), sqrt (eps)); - printf ("ls_distance_fcn faster than ls_signed_distance by %.1f%%\n", ... - 100 * ((time2 - time1) / time2)); - assert (time1 < time2); -ls_distance_fcn faster than ls_signed_distance by 19.9% -***** test - phis = ls_get_tests (); - for i = 1 : length (phis) - phi = ls_normalise (phis{i}); - d = ls_distance_fcn (phi); - sd = ls_signed_distance (phi); - assert (d, max (sd, 0), sqrt (eps)); - endfor -***** demo - n = 100; - x = linspace (-10, 10, n); - h = x(2) - x(1); - [XX, YY] = meshgrid (x, x); - - phi = ls_genbasic (XX, YY, "sphere", [0, 0], [8, 5]); - d = ls_distance_fcn (phi, h); - - figure (); - mesh (XX, YY, d); - view ([45, 45]); -7 tests, 7 passed, 0 known failure, 0 skipped -[inst/ls_setxor.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_setxor.m + ls_sign_colourmap (1, 2); ***** error - ls_setxor (1) -***** error - ls_setxor (1, 2, 3) -***** error - ls_setxor (1, [1, 2]) + ls_sign_colourmap (1); +***** error + cmap = ls_sign_colourmap (); +***** error + ls_sign_colourmap ("foo"); ***** test - assert (ls_equal (ls_setxor ([-1, -1, Inf], [1, -1, -Inf]), [-1, 1, -1])); - n = 50; - x = linspace (-10, 10, n); - h = x(2) - x(1); - [XX, YY] = meshgrid (x, x); - - phi1 = XX.^2 + YY.^2 - 8^2; - phi2 = XX.^2 + YY.^2 - 5^2; - - assert (ls_equal (ls_setdiff (phi1, phi2), ls_setxor (phi1, phi2))); -***** demo - n = 100; - x = linspace (-7, 7, n); - [XX, YY] = meshgrid (x, x); - - phi1 = (XX - 2).^2 + YY.^2 - 3^2; - phi2 = (XX + 2).^2 + YY.^2 - 3^2; - phi = ls_setxor (phi1, phi2); - figure (); - subplot (1, 2, 1); - hold ("on"); - contour (XX, YY, phi1, [0, 0], "k"); - contour (XX, YY, phi2, [0, 0], "k"); - hold ("off"); - axis ("equal"); - - subplot (1, 2, 2); - hold ("on"); - imagesc (x, x, phi); - set (gca (), "ydir", "normal"); ls_sign_colourmap (); - contour (XX, YY, phi, [0, 0], "k"); - hold ("off"); - axis ("equal"); -4 tests, 4 passed, 0 known failure, 0 skipped -[inst/ls_init_narrowband.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_init_narrowband.m -***** error - ls_init_narrowband () -***** error - ls_init_narrowband (1, 2, 3) -***** test - assert (ls_init_narrowband ([]), []); -***** test - n = 10; - x = linspace (-2, 2, n); - h = x(2) - x(1); - phi = abs (x) - 1; - - d = ls_init_narrowband (phi, h); - where = ~isna (d); - assert (d(where), phi(where), sqrt (eps)); -***** test - n = 50; - x = linspace (-2, 2, n); - h = x(2) - x(1); - [XX, YY, ZZ] = ndgrid (x); - RRsq = XX.^2 + YY.^2 + ZZ.^2; - phi = RRsq - 1; + ls_sign_colourmap ("highlight"); + ls_sign_colourmap (colours); + close (); +warning: using the gnuplot graphics toolkit is discouraged - d = ls_init_narrowband (phi, h); - where = ~isna (d); - assert (d(where), sqrt (RRsq(where)) - 1, h / 3); -***** test - tol = sqrt (eps); - assert (ls_init_narrowband ([Inf, -Inf, Inf]), [0.5, -0.5, 0.5], tol); - assert (ls_init_narrowband ([Inf, -1, Inf]), [1, 0, 1], tol); - %assert (ls_init_narrowband ([1, -Inf, 1]), [0, 1, 0], tol); -***** function dh = distToSegment (x, a, b) - dir = b - a; - dir /= norm (dir); - proj = dot (x - a, dir); - if (proj < 0) - dh = norm (x - a); - elseif (proj > 1) - dh = norm (x - b); - else - dh = norm (x - (a + proj * dir)); - endif -***** endfunction -***** function dh = distToLine (x, c) - assert (c(1, 1), 0); - dh = Inf; - for i = 2 : size (c, 2) - 1 - dh = min (dh, distToSegment (x, c(:, i), c(:, i + 1))); - endfor -***** endfunction -***** function dh = distOfContoursAsym (c1, c2) - dh = 0; - for i = 2 : size (c1, 2) - dh = max (dh, distToLine (c1(:, i), c2)); - endfor -***** endfunction -***** function dh = distOfContours (c1, c2) - dh = max (distOfContoursAsym (c1, c2), distOfContoursAsym (c2, c1)); -***** endfunction -***** test - phis = ls_get_tests (); - printf ("Comparing contours for %d cases...\n", length (phis)); - for i = 1 : length (phis) - d = ls_init_narrowband (phis{i}); - c1 = contourc (d, [0, 0]); - if (size (c1, 2) > 0) - c2 = contourc (phis{i}, [0, 0]); - dh = distOfContours (c1, c2); - printf ("i = %d: dist = %f\n", i, dh); - if (isfinite (dh)) - assert (dh, 0, 1e-1); - endif - endif - endfor -Comparing contours for 6 cases... -i = 1: dist = 0.060660 -i = 2: dist = Inf -i = 4: dist = 0.039039 -i = 5: dist = 0.085786 -i = 6: dist = 0.085786 -7 tests, 7 passed, 0 known failure, 0 skipped -[inst/ls_setdiff.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_setdiff.m +The gnuplot graphics toolkit is not actively maintained and has a number +of limitations that are unlikely to be fixed. Communication with gnuplot +uses a one-directional pipe and limited information is passed back to the +Octave interpreter so most changes made interactively in the plot window +will not be reflected in the graphics properties managed by Octave. For +example, if the plot window is closed with a mouse click, Octave will not +be notified and will not update its internal list of open figure windows. +The qt toolkit is recommended instead. ***** error - ls_setdiff (1) -***** error - ls_setdiff (1, 2, 3) -***** error - ls_setdiff (1, [1, 2]) + ls_sign_colourmap (1, 2, 3); +***** error + ls_sign_colourmap ([1, 2, 3]); +***** error + ls_sign_colourmap ([1, 2], 1); +***** error + ls_sign_colourmap ([1, 2], "foo"); ***** test - assert (ls_equal (ls_setdiff ([-1, -1, 1], [1, -1, -1]), [-1, 1, 1])); - n = 50; - x = linspace (-10, 10, n); - h = x(2) - x(1); - [XX, YY] = meshgrid (x, x); - - phi1 = XX.^2 + YY.^2 - 8^2; - phi2 = XX.^2 + YY.^2 - 5^2; - - phi = ls_setdiff (phi1, phi2); - assert (ls_issubset (phi, phi1)); - assert (ls_disjoint (phi, phi2)); - - phi = ls_setdiff (phi2, phi1); - assert (ls_isempty (phi)); + cmap = ls_sign_colourmap ([1, 2]); + cmap = ls_sign_colourmap ([1; 2], "highlight"); + cmap = ls_sign_colourmap ([1; 2], colours); ***** demo n = 100; - x = linspace (-7, 7, n); - [XX, YY] = meshgrid (x, x); - - phi1 = (XX - 2).^2 + YY.^2 - 3^2; - phi2 = (XX + 2).^2 + YY.^2 - 3^2; - phi = ls_setdiff (phi1, phi2); + x = linspace (-2, 2, n); + y = linspace (-1, 3, n); + [XX, YY] = meshgrid (x, y); + phi = ls_genbasic (XX, YY, "sphere", [0, 1], 1); figure (); - subplot (1, 2, 1); - hold ("on"); - contour (XX, YY, phi1, [0, 0], "k"); - contour (XX, YY, phi2, [0, 0], "k"); - hold ("off"); - axis ("equal"); - - subplot (1, 2, 2); - hold ("on"); - imagesc (x, x, phi); + imagesc (x, y, phi); set (gca (), "ydir", "normal"); ls_sign_colourmap (); - contour (XX, YY, phi, [0, 0], "k"); - hold ("off"); - axis ("equal"); + colorbar (); + title ("Type 'sign'"); ***** demo n = 100; - x = linspace (-7, 7, n); + x = linspace (-2, 2, n); + h = x(2) - x(1); [XX, YY] = meshgrid (x, x); - phi1 = XX.^2 + YY.^2 - 6^2; - phi2 = XX.^2 + YY.^2 - 3^2; - phi = ls_setdiff (phi1, phi2); + phi = ls_genbasic (XX, YY, "sphere", [0, 0], 1); + d = ls_signed_distance (phi, h); + F = YY .* exp (-10 * d.^2); figure (); - subplot (1, 2, 1); hold ("on"); - contour (XX, YY, phi1, [0, 0], "k"); - contour (XX, YY, phi2, [0, 0], "k"); - hold ("off"); - axis ("equal"); - - subplot (1, 2, 2); - hold ("on"); - imagesc (x, x, phi); + imagesc (x, x, F); set (gca (), "ydir", "normal"); - ls_sign_colourmap (); - contour (XX, YY, phi, [0, 0], "k"); + ls_sign_colourmap ("highlight"); + colorbar (); + contour (XX, YY, phi, [0, 0], "k", "LineWidth", 2); hold ("off"); - axis ("equal"); -4 tests, 4 passed, 0 known failure, 0 skipped + title ("Type 'highlight'"); +10 tests, 10 passed, 0 known failure, 0 skipped [inst/ls_extract_solution.m] >>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_extract_solution.m ***** error @@ -3932,7 +3952,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.088561 to 0.090209 warning: called from @@ -3940,7 +3960,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.088561 to 0.090209 warning: called from @@ -3948,7 +3968,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.088561 to 0.090209 warning: called from @@ -3956,7 +3976,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.088561 to 0.090209 warning: called from @@ -3964,7 +3984,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.088561 to 0.090209 warning: called from @@ -3972,7 +3992,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.088561 to 0.090209 warning: called from @@ -3980,7 +4000,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.088561 to 0.090209 warning: called from @@ -3988,7 +4008,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.088561 to 0.090209 warning: called from @@ -3996,7 +4016,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.088561 to 0.090209 warning: called from @@ -4004,7 +4024,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.088561 to 0.090209 warning: called from @@ -4012,7 +4032,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.088561 to 0.090209 warning: called from @@ -4020,7 +4040,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.088561 to 0.090209 warning: called from @@ -4028,7 +4048,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.088561 to 0.090209 warning: called from @@ -4036,7 +4056,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.088561 to 0.090209 warning: called from @@ -4044,7 +4064,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.088561 to 0.090209 warning: called from @@ -4052,7 +4072,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.088561 to 0.090209 warning: called from @@ -4060,7 +4080,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.088561 to 0.090209 warning: called from @@ -4068,7 +4088,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.088561 to 0.090209 warning: called from @@ -4076,7 +4096,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.088561 to 0.090209 warning: called from @@ -4084,7 +4104,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.088561 to 0.090209 warning: called from @@ -4092,7 +4112,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.088561 to 0.090209 warning: called from @@ -4100,7 +4120,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.088561 to 0.090209 warning: called from @@ -4108,7 +4128,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.088561 to 0.090209 warning: called from @@ -4116,7 +4136,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.105699 to 0.105896 warning: called from @@ -4124,7 +4144,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.105699 to 0.105896 warning: called from @@ -4132,7 +4152,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.105699 to 0.105896 warning: called from @@ -4140,7 +4160,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.105699 to 0.105896 warning: called from @@ -4148,7 +4168,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.105699 to 0.105896 warning: called from @@ -4156,7 +4176,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.105699 to 0.105896 warning: called from @@ -4164,7 +4184,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.105699 to 0.105896 warning: called from @@ -4172,7 +4192,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.105699 to 0.105896 warning: called from @@ -4180,7 +4200,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.105699 to 0.105896 warning: called from @@ -4188,7 +4208,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.105699 to 0.105896 warning: called from @@ -4196,7 +4216,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.105699 to 0.105896 warning: called from @@ -4204,7 +4224,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.105699 to 0.105896 warning: called from @@ -4212,7 +4232,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.105699 to 0.105896 warning: called from @@ -4220,7 +4240,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.105699 to 0.105896 warning: called from @@ -4228,7 +4248,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.105699 to 0.105896 warning: called from @@ -4236,7 +4256,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.105699 to 0.105896 warning: called from @@ -4244,7 +4264,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.105699 to 0.105896 warning: called from @@ -4252,7 +4272,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.105699 to 0.105896 warning: called from @@ -4260,7 +4280,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.105699 to 0.105896 warning: called from @@ -4268,7 +4288,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.105699 to 0.105896 warning: called from @@ -4276,7 +4296,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.105699 to 0.105896 warning: called from @@ -4284,7 +4304,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.105699 to 0.105896 warning: called from @@ -4292,7 +4312,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.105699 to 0.105896 warning: called from @@ -4300,7 +4320,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 warning: increased distance in fast marching 0.105699 to 0.105896 warning: called from @@ -4308,7 +4328,7 @@ ls_signed_distance at line 45 column 5 __test__ at line 16 column 7 test at line 682 column 11 - /tmp/tmp.VrRhChsYl7 at line 118 column 31 + /tmp/tmp.V4echIb6Q7 at line 62 column 31 ***** demo n = 100; @@ -4343,6 +4363,141 @@ phi0 = ls_genbasic (XX, YY, "sphere", [0, 0], 3); ls_animate_evolution (phi0, F, h, linspace (0, 3, 40), 0.01); 8 tests, 8 passed, 0 known failure, 0 skipped +[inst/ls_init_narrowband.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_init_narrowband.m +***** error + ls_init_narrowband () +***** error + ls_init_narrowband (1, 2, 3) +***** test + assert (ls_init_narrowband ([]), []); +***** test + n = 10; + x = linspace (-2, 2, n); + h = x(2) - x(1); + phi = abs (x) - 1; + + d = ls_init_narrowband (phi, h); + where = ~isna (d); + assert (d(where), phi(where), sqrt (eps)); +***** test + n = 50; + x = linspace (-2, 2, n); + h = x(2) - x(1); + [XX, YY, ZZ] = ndgrid (x); + RRsq = XX.^2 + YY.^2 + ZZ.^2; + phi = RRsq - 1; + + d = ls_init_narrowband (phi, h); + where = ~isna (d); + assert (d(where), sqrt (RRsq(where)) - 1, h / 3); +***** test + tol = sqrt (eps); + assert (ls_init_narrowband ([Inf, -Inf, Inf]), [0.5, -0.5, 0.5], tol); + assert (ls_init_narrowband ([Inf, -1, Inf]), [1, 0, 1], tol); + %assert (ls_init_narrowband ([1, -Inf, 1]), [0, 1, 0], tol); +***** function dh = distToSegment (x, a, b) + dir = b - a; + dir /= norm (dir); + proj = dot (x - a, dir); + if (proj < 0) + dh = norm (x - a); + elseif (proj > 1) + dh = norm (x - b); + else + dh = norm (x - (a + proj * dir)); + endif +***** endfunction +***** function dh = distToLine (x, c) + assert (c(1, 1), 0); + dh = Inf; + for i = 2 : size (c, 2) - 1 + dh = min (dh, distToSegment (x, c(:, i), c(:, i + 1))); + endfor +***** endfunction +***** function dh = distOfContoursAsym (c1, c2) + dh = 0; + for i = 2 : size (c1, 2) + dh = max (dh, distToLine (c1(:, i), c2)); + endfor +***** endfunction +***** function dh = distOfContours (c1, c2) + dh = max (distOfContoursAsym (c1, c2), distOfContoursAsym (c2, c1)); +***** endfunction +***** test + phis = ls_get_tests (); + printf ("Comparing contours for %d cases...\n", length (phis)); + for i = 1 : length (phis) + d = ls_init_narrowband (phis{i}); + c1 = contourc (d, [0, 0]); + if (size (c1, 2) > 0) + c2 = contourc (phis{i}, [0, 0]); + dh = distOfContours (c1, c2); + printf ("i = %d: dist = %f\n", i, dh); + if (isfinite (dh)) + assert (dh, 0, 1e-1); + endif + endif + endfor +Comparing contours for 6 cases... +i = 1: dist = 0.060660 +i = 2: dist = Inf +i = 4: dist = 0.039039 +i = 5: dist = 0.085786 +i = 6: dist = 0.085786 +7 tests, 7 passed, 0 known failure, 0 skipped +[inst/ls_hausdorff_dist.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_hausdorff_dist.m +***** error + ls_hausdorff_dist (1) +***** error + ls_hausdorff_dist (1, 2, 3, 4) +***** error + ls_hausdorff_dist (1, 2, [3, 3]) +***** error + ls_hausdorff_dist (1, 2, "foo") +***** test + n = 50; + x = linspace (-5, 5, n); + h = x(2) - x(1); + [XX, YY] = meshgrid (x, x); + + phi1 = ls_genbasic (XX, YY, "sphere", [3, 0], 1); + phi2 = ls_genbasic (XX, YY, "sphere", [-2, 0], 2); + assert (ls_hausdorff_dist (phi1, phi2, h), 6, h); + + % Make sure that phi isn't a signed-distance fcn already. + % ls_genbasic should return the same, but make it explicit. + rSq = XX.^2 + YY.^2; + d = ls_hausdorff_dist (rSq - 4^2, rSq - 2^2, h); + assert (d, 2, h); + dWrong = ls_hausdorff_dist (rSq - 4^2, rSq - 2^2, "sd"); + assert (abs (d - dWrong) > 10 * h); + dRight = ls_hausdorff_dist (sqrt (rSq) - 4, sqrt (rSq) - 2, "sd"); + assert (dRight, d, h); +***** test + n = 200; + x = linspace (-5, 5, n); + h = x(2) - x(1); + [XX, YY] = meshgrid (x, x); + + phiA = ls_genbasic (XX, YY, "sphere", [0, 0], 4); + phiInner = ls_genbasic (XX, YY, "sphere", [0, 0], 2); + phiB = ls_setdiff (phiA, phiInner); + + d1 = ls_hausdorff_dist (phiA, phiB, h); + d2 = ls_hausdorff_dist (phiB, phiA, h); + assert (d1, d2); + assert (d1, 2, 2 * h); + dc = ls_hausdorff_dist (ls_complement (phiA), ... + ls_complement (phiB), h); + assert (dc, 4, 2 * h); + + sdA = ls_signed_distance (phiA, h); + sdB = ls_signed_distance (phiB, h); + sdDiff = norm (sdA(:) - sdB(:), inf); + assert (abs (sdDiff - d1) > 10 * h); +6 tests, 6 passed, 0 known failure, 0 skipped [inst/so_init_params.m] >>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/so_init_params.m ***** error @@ -4362,221 +4517,84 @@ pkg load parallel; p = so_init_params (true, 2); 7 tests, 7 passed, 0 known failure, 0 skipped -[inst/ls_normalise.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_normalise.m -***** error - ls_normalise () -***** error - ls_normalise (1, 2, 3, 4) -***** test - h = 0.1; - zeroTol = 0.2; - phi = ones (4, 4); - phiEx = phi; - phi(2 : 3, 2 : 3) = [-eps, -0; 0, eps]; - phiEx(2 : 3, 2 : 3) = [-zeroTol*h, -zeroTol*h; zeroTol*h, zeroTol*h]; - phin = ls_normalise (phi, h, zeroTol); - if (exist ("signbit") == 5) - assert (phin, phiEx); - else - warning ("'signbit' function not available, skipping test."); - endif -3 tests, 3 passed, 0 known failure, 0 skipped -[inst/ls_check.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_check.m +[inst/ls_complement.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_complement.m ***** error - ls_check (1, 2) -***** error - ls_check (1, 2, 3, 4) -***** error - ls_check (1, "inside", [1, 2]); -***** error - ls_check (1, "foo", true); -***** error - ls_check (1, NA, false); + ls_complement () +***** error + ls_complement (1, 2) ***** test - n = 100; + n = 50; x = linspace (-10, 10, n); + h = x(2) - x(1); [XX, YY] = meshgrid (x, x); - circ2 = (XX.^2 + YY.^2 < 2^2); - circ8 = (XX.^2 + YY.^2 < 8^2); - phi = (XX.^2 + YY.^2 - 5^2); + phi1 = (XX - 2).^2 + (YY - 2).^2 - 2^2; + phi2 = (XX + 2).^2 + (YY + 2).^2 - 2^2; - assert (ls_check (phi, "inside", circ8)); - assert (ls_check (phi, "contain", circ2)); - assert (ls_check (phi, "outside", ~circ8)); + assert (ls_disjoint (phi1, ls_complement (phi1))); + assert (ls_disjoint (phi2, ls_complement (phi2))); - assert (~ls_check (phi, "inside", circ2)); - assert (~ls_check (phi, "contain", circ8)); - assert (~ls_check (phi, "outside", circ8)); -6 tests, 6 passed, 0 known failure, 0 skipped -[inst/so_step_armijo.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/so_step_armijo.m -***** function s = updateState (phi, data) - inside = ls_inside (phi); - vol = data.g.h * length (find (inside)); - cost = 1 / vol; + assert (~ls_disjoint (phi1, ls_complement (phi2))); + assert (~ls_disjoint (phi2, ls_complement (phi1))); - % Throw if the volume is too large. This is used - % to check the error handling code. - if (vol > 15) - error ("volume too large"); - endif + sd1 = ls_signed_distance (ls_complement (phi1), h); + sd2 = ls_complement (ls_signed_distance (phi1, h)); + assert (sd1, sd2, sqrt (eps)); +3 tests, 3 passed, 0 known failure, 0 skipped +[inst/so_run_descent.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/so_run_descent.m +***** shared data, phi0 + data = struct (); + data.p = so_init_params (false); + data.p.vol = 10; + data.p.weight = 50; - s = struct ("phi", phi, "cost", cost); -***** endfunction -***** shared n, phi, baseData, d, f, dJ n = 100; x = linspace (-10, 10, n); h = x(2) - x(1); - a = 0; - b = 5; - phi = ls_genbasic (x, "box", a, b); - - baseData = struct (); - baseData.p = so_init_params (false); - baseData.g = struct ("x", x, "h", h); - baseData.cb = struct ("update_state", @updateState); - baseData.s = updateState (phi, baseData); - baseData.s.phi = phi; + data.g = struct ("x", x, "h", h); - f = ones (size (phi)); - d = ls_solve_stationary (phi, f, h); + data = so_example_problem (data); + data.handler = struct (); - curVol = b - a; - dJ = -2 / curVol^2; + phi0 = ls_genbasic (data.g.x, "box", -3, 5); ***** error - so_step_armijo (1, 2, 3, 4) -***** error - so_step_armijo (1, 2, 3, 4, 5, 6) + so_run_descent (1, 2); +***** error + so_run_descent (1, 2, 3, 4); ***** error - so_step_armijo ([1, 1], 2, 3, 4, struct ()) + so_run_descent (0, phi0, data); ***** error - so_step_armijo (1, 2, 3, [4, 4], struct ()) + so_run_descent (1.5, phi0, data); ***** error - so_step_armijo (1, 2, 3, 4, 5) -***** error - so_step_armijo (1, d, f, 4, baseData) -***** error - so_step_armijo (1, 2, f, dJ, baseData) -***** error - so_step_armijo (1, 2, 3, dJ, baseData) -***** error - data = baseData; - data.p.lineSearch.relaxation = 0; - so_step_armijo (1, d, f, dJ, data); -***** error - data = baseData; - data.p.lineSearch.relaxation = 1; - so_step_armijo (1, d, f, dJ, data); -***** error - data = baseData; - data.p.lineSearch.backtrack = 0; - so_step_armijo (1, d, f, dJ, data); -***** error - data = baseData; - data.p.lineSearch.backtrack = 1; - so_step_armijo (1, d, f, dJ, data); -***** error - data = baseData; - data.p.lineSearch.initial = 1; - so_step_armijo (1, d, f, dJ, data); -***** error - data = baseData; - data.p.lineSearch.minStep = -1; - so_step_armijo (1, d, f, dJ, data); -***** test - data = baseData; - data.p.lineSearch.minStep = 0; - so_step_armijo (1, d, f, dJ, data); -***** test - data = baseData; - data.p.verbose = true; - data.p.lineSearch.relaxation = 0.9; - [~, t] = so_step_armijo (1, d, f, dJ, data); - assert (t < 0.5); -Armijo step 2.000000: cost = 0.110000 -Armijo step 1.600000: cost = 0.120732 -Armijo step 1.280000: cost = 0.133784 -Armijo step 1.024000: cost = 0.141429 -Armijo step 0.819200: cost = 0.150000 -Armijo step 0.655360: cost = 0.159677 -Armijo step 0.524288: cost = 0.165000 -Armijo step 0.419430: cost = 0.170690 -Armijo step 0.335544: cost = 0.176786 -Armijo step 0.268435: cost = 0.183333 -Armijo step 0.214748: cost = 0.183333 -Armijo step 0.171799: cost = 0.183333 + so_run_descent ([2, 3], phi0, data); +***** error + d = data; + d.p.descent.initialStep = 0; + so_run_descent (1, phi0, d); ***** test - so_step_armijo (2, d, f, dJ, baseData); -***** error - so_step_armijo (3, d, f, dJ, baseData); -18 tests, 18 passed, 0 known failure, 0 skipped -[inst/so_replay_descent.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/so_replay_descent.m -***** error - so_replay_descent (1); -***** error - so_replay_descent (1, 2, 3, 4); -***** error - so_replay_descent (1, 2, 0); -***** error - so_replay_descent (1, 2, 1.5); -***** error - so_replay_descent (1, 2, [2, 3]); -***** error - so_replay_descent (struct (), 2); -***** error - so_replay_descent ([2, 3], 2); -***** error <'fload' is not available> - pkg unload -nodeps parallel; - so_replay_descent ("foo", 2); -***** function x = compressionCheckStruct (s, data) - x = struct ("weight", data.p.weight, "cost", s.cost); -***** endfunction -***** function checkCompression (s, data, field) - assert (isfield (s, field)); - assert (getfield (s, field), compressionCheckStruct (s, data)); -***** endfunction -***** function s = compressState (s, data) - s.compressed = compressionCheckStruct (s, data); -***** endfunction -***** function s = uncompressState (s, data) - checkCompression (s, data, "compressed"); - s.uncompressed = compressionCheckStruct (s, data); -***** endfunction -***** function log = initialised (data) - log = data.log; - log.mashUp = [data.s.a, data.s.b]; -***** endfunction -***** function log = beforeStep (k, data) - log = data.log; - log.mashUp = [log.mashUp, k, data.s.vol]; + nSteps = 12; - if (data.checkUncompression) - checkCompression (data.s, data, "uncompressed"); - endif -***** endfunction -***** function log = direction (k, f, dJ, data) - log = data.log; - log.mashUp = [log.mashUp, k, mean(f), sum(f), dJ, data.s.integ]; -***** endfunction -***** function log = afterStep (k, t, s, data) - log = data.log; - log.mashUp = [log.mashUp, k, t, s.a, s.b, s.cost, data.s.cost]; + [s, descentLog] = so_run_descent (nSteps, phi0, data); + assert (s.cost, 0, 1e-3); + assert (length (descentLog.costs), nSteps + 1); + assert (descentLog.costs(end), s.cost); + %semilogy (descentLog.costs, "o"); +***** test + tol = 5e-2; + nSteps = 100; + d = data; + d.cb.check_stop = @(data) (data.cost < tol); - if (data.checkUncompression) - checkCompression (s, data, "uncompressed"); - endif -***** endfunction -***** function log = finished (data) - log = data.log; - log.mashUp = [log.mashUp, data.s.cost, log.steps, log.costs]; -***** endfunction -***** function data = getData () + [s, descentLog] = so_run_descent (nSteps, phi0, d); + assert (s.cost < tol); + printf ("Steps needed: %d\n", descentLog.steps); + assert (descentLog.steps < nSteps); +Steps needed: 8 +***** demo data = struct (); - data.p = so_init_params (false); + data.p = so_init_params (true); data.p.vol = 10; data.p.weight = 50; @@ -4585,163 +4603,94 @@ h = x(2) - x(1); data.g = struct ("x", x, "h", h); + % Look at so_example_problem to see how the callbacks + % and the plotting handler is defined. data = so_example_problem (data); - data.handler = struct ("initialised", @initialised, ... - "before_step", @beforeStep, ... - "direction", @direction, ... - "after_step", @afterStep, ... - "finished", @finished); - - % Unless explicitly set, do not expect compressed states. - data.checkUncompression = false; - - data.phi0 = ls_genbasic (data.g.x, "box", -3, 5); -***** endfunction -***** function data = getDataForCompression (uncompress) - data = getData (); - data.compress = struct (); - data.compress.save = struct ("state", @compressState); - data.compress.load = struct ("state", @uncompressState); - data.checkUncompression = uncompress; -***** endfunction -***** function compareResults (s1, l1, s2, l2) - assert (s2, s1); - assert (l2.mashUp, l1.mashUp); -***** endfunction -***** xtest - pkg load parallel; - - nSteps = 10; - baseData = getData (); - f = tempname (); - data = so_save_descent (f, struct (), baseData); - [s1, l1] = so_run_descent (nSteps, data.phi0, data); - [s2, l2] = so_replay_descent (f, @getData); - unlink (f); - compareResults (s1, l1, s2, l2); - - f = tmpfile (); - data = so_save_descent (f, struct (), baseData); - [s1, l1] = so_run_descent (nSteps, data.phi0, data); - frewind (f); - [s2, l2] = so_replay_descent (f, @getData); - fclose (f); - compareResults (s1, l1, s2, l2); - - [pr, pw] = pipe (); - data = so_save_descent (pw, struct (), baseData); - [s1, l1] = so_run_descent (nSteps, data.phi0, data); - fclose (pw); - [s2, l2] = so_replay_descent (pr, @getData); - fclose (pr); - compareResults (s1, l1, s2, l2); -!!!!! known failure -structure has no member 'openFile' -***** xtest - pkg load parallel; - - baseData = getData (); - [pr, pw] = pipe (); - data = so_save_descent (pw, struct (), baseData); - data.cb.check_stop = @() true; - [s1, l1] = so_run_descent (1, data.phi0, data); - fclose (pw); - assert (l1.steps, 0); - [s2, l2] = so_replay_descent (pr, @getData); - fclose (pr); - compareResults (s1, l1, s2, l2); - - baseData = getData (); - [pr, pw] = pipe (); - data = so_save_descent (pw, struct (), baseData); - [s1, l1] = so_run_descent (1, data.phi0, data); - fclose (pw); - [s2, l2] = so_replay_descent (pr, @getData, 1); - fclose (pr); - compareResults (s1, l1, s2, l2); -!!!!! known failure -structure has no member 'openFile' -***** xtest - pkg load parallel; - - nStepsShort = 5; - nStepsLong = 10; + phi0 = ls_genbasic (data.g.x, "box", -3, 7); + [s, descentLog] = so_run_descent (5, phi0, data); - baseData = getData (); - [prl, pwl] = pipe (); - data = so_save_descent (pwl, struct (), baseData); - [sl, ll] = so_run_descent (nStepsLong, data.phi0, data); - fclose (pwl); + figure (); + semilogy (0 : descentLog.steps, descentLog.costs, "o"); + title ("Cost Descrease"); - baseData = getData (); - [prs, pws] = pipe (); - data = so_save_descent (pws, struct (), baseData); - [ss, ls] = so_run_descent (nStepsShort, data.phi0, data); - fclose (pws); + printf ("\nFinal interval: [%.6d, %.6d]\n", s.a, s.b); + printf ("Final cost: %.6d\n", s.cost); +8 tests, 8 passed, 0 known failure, 0 skipped +[inst/so_example_problem.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/so_example_problem.m +***** shared basicData + basicData = struct (); + basicData.p = so_init_params (true); + basicData.p.vol = 4; + basicData.p.weight = 10; - [s, l] = so_replay_descent (prl, @getData, nStepsShort); - fclose (prl); - compareResults (s, l, ss, ls); + n = 50; + x = linspace (-4, 5, n); + h = x(2) - x(1); + basicData.g = struct ("x", x, "h", h); +***** error + so_example_problem (); +***** error + so_example_problem (1, 2); +***** error + so_example_problem (1); +***** test + data = so_example_problem (basicData); + phi = ls_genbasic (data.g.x, "box", -2.5, 1.3); - [s, l] = so_replay_descent (prs, @getData, nStepsLong); - fclose (prs); - compareResults (s, l, sl, ll); -!!!!! known failure -structure has no member 'openFile' -***** xtest - pkg load parallel; + [a, b] = data.util.bounds (phi, data); + assert (a, -2.5, sqrt (eps)); + assert (b, 1.3, sqrt (eps)); +***** test + data = so_example_problem (basicData); - nSteps = 10; - [pr, pw] = pipe (); + phi = ls_genbasic (data.g.x, "box", -2, 2); + s0 = data.cb.update_state (phi, data); - data = getDataForCompression (false); - data = so_save_descent (pw, struct (), data); - [s1, l1] = so_run_descent (nSteps, data.phi0, data); - fclose (pw); + phi = ls_genbasic (data.g.x, "box", -3, 3); + s1 = data.cb.update_state (phi, data); - init = @(header) getDataForCompression (true); - [s2, l2] = so_replay_descent (pr, init); - fclose (pr); + phi = ls_genbasic (data.g.x, "box", -1, 1); + s2 = data.cb.update_state (phi, data); - % No result comparison here, since the compress / uncompress - % functions introduced changes to the state structs. -!!!!! known failure -structure has no member 'openFile' -***** demo - pkg load parallel; + phi = ls_genbasic (data.g.x, "box", -1, 3); + s3 = data.cb.update_state (phi, data); - data = struct (); - data.p = so_init_params (false); - data.p.vol = 10; - data.p.weight = 50; + phi = ls_genbasic (data.g.x, "box", -3, 1); + s4 = data.cb.update_state (phi, data); - n = 100; - x = linspace (-10, 10, n); - h = x(2) - x(1); - data.g = struct ("x", x, "h", h); + assert (all ([s0.cost, s1.cost, s2.cost, s3.cost, s4.cost] >= 0)); + assert (s0.cost, 0, 1e-1); + assert (s1.cost > s3.cost); + assert (s1.cost > s4.cost); + assert (s2.cost > s3.cost); + assert (s2.cost > s4.cost); + assert (s3.cost > s0.cost); + assert (s4.cost > s0.cost); +***** function testDeriv (a, b, data) + phi = ls_genbasic (data.g.x, "box", a, b); + data.s = data.cb.update_state (phi, data); + [f, dJ] = data.cb.get_direction (data); + assert (dJ < 0); - data = so_example_problem (data); - phi0 = ls_genbasic (data.g.x, "box", -3, 7); + dt = 5e-3; + dists = ls_solve_stationary (phi, f, data.g.h); + phip = ls_extract_solution (dt, dists, phi, f); + sp = data.cb.update_state (phip, data); - printf ("Computing descent...\n"); - [pr, pw] = pipe (); - d = data; - d.handler = struct (); - d = so_save_descent (pw, struct (), d); - s = so_run_descent (5, phi0, d); - fclose (pw); - printf ("Final cost: %.6d\n", s.cost); + assert (sp.cost < data.s.cost); + relErr = abs (sp.cost - (data.s.cost + dt * dJ)) / data.s.cost; + assert (relErr < 0.1); +***** endfunction +***** test + data = so_example_problem (basicData); - printf ("\nNow replaying...\n"); - d = data; - d.p.verbose = true; - init = @() d; - s = so_replay_descent (pr, init); - fclose (pr); - printf ("Final cost: %.6d\n", s.cost); -warning: test: file /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/so_replay_descent.m leaked file descriptors -12 tests, 8 passed, 4 known failures, 0 skipped + testDeriv (-1, 1, data); + testDeriv (-3, 3, data); + testDeriv (-1, 3, data); + testDeriv (-3, 1, data); +6 tests, 6 passed, 0 known failure, 0 skipped [inst/ls_solve_stationary.m] >>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_solve_stationary.m ***** error @@ -4840,21 +4789,6 @@ line ([0, 0], [2, 10]); title ("Diffraction"); 8 tests, 8 passed, 0 known failure, 0 skipped -[inst/ls_inside.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_inside.m -***** error - ls_inside () -***** error - ls_inside (1, 2) -***** test - assert (ls_inside ([1, 0, -1, 0, 1]), [false, false, true, false, false]); -***** test - if (exist ("signbit") == 5) - assert (ls_inside ([-0, 0]), [true, false]); - else - warning ("'signbit' function not available, skipping test."); - endif -4 tests, 4 passed, 0 known failure, 0 skipped [inst/ls_isempty.m] >>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_isempty.m ***** error @@ -4873,79 +4807,6 @@ assert (ls_isempty (ls_intersect (phi1, phi2))); assert (~ls_isempty (ls_union (phi1, phi2))); 3 tests, 3 passed, 0 known failure, 0 skipped -[inst/ls_sign_colourmap.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_sign_colourmap.m -***** shared colours - colours = [1, 1, 1; 0, 0, 0; 1, 1, 1; 0, 0, 0]; -***** error - ls_sign_colourmap (1, 2); -***** error - ls_sign_colourmap (1); -***** error - cmap = ls_sign_colourmap (); -***** error - ls_sign_colourmap ("foo"); -***** test - figure (); - ls_sign_colourmap (); - ls_sign_colourmap ("highlight"); - ls_sign_colourmap (colours); - close (); -warning: using the gnuplot graphics toolkit is discouraged - -The gnuplot graphics toolkit is not actively maintained and has a number -of limitations that are unlikely to be fixed. Communication with gnuplot -uses a one-directional pipe and limited information is passed back to the -Octave interpreter so most changes made interactively in the plot window -will not be reflected in the graphics properties managed by Octave. For -example, if the plot window is closed with a mouse click, Octave will not -be notified and will not update its internal list of open figure windows. -The qt toolkit is recommended instead. -***** error - ls_sign_colourmap (1, 2, 3); -***** error - ls_sign_colourmap ([1, 2, 3]); -***** error - ls_sign_colourmap ([1, 2], 1); -***** error - ls_sign_colourmap ([1, 2], "foo"); -***** test - cmap = ls_sign_colourmap ([1, 2]); - cmap = ls_sign_colourmap ([1; 2], "highlight"); - cmap = ls_sign_colourmap ([1; 2], colours); -***** demo - n = 100; - x = linspace (-2, 2, n); - y = linspace (-1, 3, n); - [XX, YY] = meshgrid (x, y); - phi = ls_genbasic (XX, YY, "sphere", [0, 1], 1); - - figure (); - imagesc (x, y, phi); - set (gca (), "ydir", "normal"); - ls_sign_colourmap (); - colorbar (); - title ("Type 'sign'"); -***** demo - n = 100; - x = linspace (-2, 2, n); - h = x(2) - x(1); - [XX, YY] = meshgrid (x, x); - - phi = ls_genbasic (XX, YY, "sphere", [0, 0], 1); - d = ls_signed_distance (phi, h); - F = YY .* exp (-10 * d.^2); - - figure (); - hold ("on"); - imagesc (x, x, F); - set (gca (), "ydir", "normal"); - ls_sign_colourmap ("highlight"); - colorbar (); - contour (XX, YY, phi, [0, 0], "k", "LineWidth", 2); - hold ("off"); - title ("Type 'highlight'"); -10 tests, 10 passed, 0 known failure, 0 skipped [inst/ls_nb_from_geom.m] >>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_nb_from_geom.m ***** error @@ -5021,6 +4882,76 @@ hold ("off"); colorbar (); 7 tests, 7 passed, 0 known failure, 0 skipped +[inst/ls_distance_fcn.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_distance_fcn.m +***** error + ls_distance_fcn () +***** error + ls_distance_fcn (1, 2, 3) +***** test + assert (ls_distance_fcn ([]), []); +***** test + n = 10; + x = linspace (-2, 2, n); + h = x(2) - x(1); + phi = abs (x) - 1; + + d = ls_distance_fcn (phi, h); + assert (d, max (phi, 0), sqrt (eps)); +***** test + n = 50; + x = linspace (-2, 2, n); + h = x(2) - x(1); + [XX, YY, ZZ] = ndgrid (x); + RRsq = XX.^2 + YY.^2 + ZZ.^2; + phi = RRsq - 1; + + d = ls_distance_fcn (phi, h); + assert (d, max (sqrt (RRsq) - 1, 0), h); +***** xtest + n = 500; + x = linspace (-10, 10, n); + h = x(2) - x(1); + + [XX, YY] = meshgrid (x, x); + phi = ls_genbasic (XX, YY, "sphere", [0, 0], 8); + + id = tic (); + d = ls_distance_fcn (phi, h); + time1 = toc (id); + + id = tic (); + sd = ls_signed_distance (phi, h); + time2 = toc (id); + + assert (d, max (sd, 0), sqrt (eps)); + printf ("ls_distance_fcn faster than ls_signed_distance by %.1f%%\n", ... + 100 * ((time2 - time1) / time2)); + assert (time1 < time2); +ls_distance_fcn faster than ls_signed_distance by -4.5% +!!!!! known failure +assert (time1 < time2) failed +***** test + phis = ls_get_tests (); + for i = 1 : length (phis) + phi = ls_normalise (phis{i}); + d = ls_distance_fcn (phi); + sd = ls_signed_distance (phi); + assert (d, max (sd, 0), sqrt (eps)); + endfor +***** demo + n = 100; + x = linspace (-10, 10, n); + h = x(2) - x(1); + [XX, YY] = meshgrid (x, x); + + phi = ls_genbasic (XX, YY, "sphere", [0, 0], [8, 5]); + d = ls_distance_fcn (phi, h); + + figure (); + mesh (XX, YY, d); + view ([45, 45]); +7 tests, 6 passed, 1 known failure, 0 skipped [inst/ls_equal.m] >>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_equal.m ***** error @@ -5041,81 +4972,465 @@ warning ("'signbit' function not available, skipping test."); endif 5 tests, 5 passed, 0 known failure, 0 skipped -[inst/so_run_descent.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/so_run_descent.m -***** shared data, phi0 - data = struct (); - data.p = so_init_params (false); - data.p.vol = 10; - data.p.weight = 50; +[inst/ls_setxor.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_setxor.m +***** error + ls_setxor (1) +***** error + ls_setxor (1, 2, 3) +***** error + ls_setxor (1, [1, 2]) +***** test + assert (ls_equal (ls_setxor ([-1, -1, Inf], [1, -1, -Inf]), [-1, 1, -1])); + n = 50; + x = linspace (-10, 10, n); + h = x(2) - x(1); + [XX, YY] = meshgrid (x, x); + + phi1 = XX.^2 + YY.^2 - 8^2; + phi2 = XX.^2 + YY.^2 - 5^2; + assert (ls_equal (ls_setdiff (phi1, phi2), ls_setxor (phi1, phi2))); +***** demo n = 100; + x = linspace (-7, 7, n); + [XX, YY] = meshgrid (x, x); + + phi1 = (XX - 2).^2 + YY.^2 - 3^2; + phi2 = (XX + 2).^2 + YY.^2 - 3^2; + phi = ls_setxor (phi1, phi2); + + figure (); + subplot (1, 2, 1); + hold ("on"); + contour (XX, YY, phi1, [0, 0], "k"); + contour (XX, YY, phi2, [0, 0], "k"); + hold ("off"); + axis ("equal"); + + subplot (1, 2, 2); + hold ("on"); + imagesc (x, x, phi); + set (gca (), "ydir", "normal"); + ls_sign_colourmap (); + contour (XX, YY, phi, [0, 0], "k"); + hold ("off"); + axis ("equal"); +4 tests, 4 passed, 0 known failure, 0 skipped +[inst/ls_build_mesh.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_build_mesh.m +***** error + ls_build_mesh (1) +***** error + ls_build_mesh (1, 2, 3, 4) +***** error + x = linspace (-10, 10, 10); + h = x(2) - x(1); + [XX, YY] = meshgrid (x, x); + phi = ls_genbasic (XX, YY, "sphere", [0, 0], 5); + phi = ls_normalise (phi, h); + geom = ls_find_geometry (phi, h); + ls_build_mesh (geom, phi); +***** function verifyDirection (a, b, centre) + v1 = [a - centre; 0]; + v2 = [b - centre; 0]; + x = cross (v1, v2); + assert (x(1 : 2), zeros (2, 1)); + assert (x(3) > 0); +***** endfunction +***** function verifyMesh (geom, phi, glob) + [mesh, vmap] = ls_build_mesh (geom, phi, glob); + nPts = prod (geom.dim); + + % Verify ordering of triangle points. + for i = 1 : size (mesh.t, 2) + verifyDirection (mesh.p(:, mesh.t(1, i)), mesh.p(:, mesh.t(2, i)), ... + mesh.p(:, mesh.t(3, i))); + endfor + + % Go through all grid points and verify them with the mesh. + for i = 1 : nPts + gridInd = vmap.grid(i); + if (isna (gridInd)) + assert (!glob); + continue; + endif + + assert (vmap.mesh(gridInd), i); + assert (mesh.p(:, gridInd), geom.nodes.coord(i, :)'); + endfor + + % Go through all intersection points and verify them. + for i = 1 : geom.ispts.n + gridInd = vmap.ispt(i); + assert (vmap.mesh(gridInd), -i); + assert (mesh.p(:, gridInd), geom.ispts.coord(i, :)'); + endfor + + % Verify mesh.e against geom.bedges. + for i = 1 : geom.bedges.n + assert (mesh.e(1 : 2, i), vmap.ispt(geom.bedges.ispts(i, :)')); + assert (mesh.e(5, i), geom.bedges.comp(i)); + endfor +***** endfunction +***** function verifyPhi (phi, XX, YY, h) + for s = [-1, 1] + cur = phi * s; + cur = ls_normalise (cur, h); + geom = ls_find_geometry (cur, h); + geom = ls_absolute_geom (geom, XX, YY); + + verifyMesh (geom, cur, false); + verifyMesh (geom, cur, true); + endfor +***** endfunction +***** test + n = 20; x = linspace (-10, 10, n); h = x(2) - x(1); - data.g = struct ("x", x, "h", h); + [XX, YY] = meshgrid (x, x); - data = so_example_problem (data); - data.handler = struct (); + phi = ls_union (ls_genbasic (XX, YY, "sphere", [-6, -6], 3), ... + ls_genbasic (XX, YY, "sphere", [6, 6], 3)); + verifyPhi (phi, XX, YY, h); - phi0 = ls_genbasic (data.g.x, "box", -3, 5); -***** error - so_run_descent (1, 2); -***** error - so_run_descent (1, 2, 3, 4); -***** error - so_run_descent (0, phi0, data); + phi = ls_setdiff (ls_genbasic (XX, YY, "sphere", [0, 0], 8), ... + ls_genbasic (XX, YY, "sphere", [0, 0], 4)); + verifyPhi (phi, XX, YY, h); +***** demo + x = linspace (-10, 10, 11); + h = x(2) - x(1); + [XX, YY] = meshgrid (x, x); + + phi = ls_union (ls_genbasic (XX, YY, "sphere", [5, 5], 4.5), ... + ls_genbasic (XX, YY, "sphere", [-2, -2], 4)); + phi = ls_normalise (phi, h); + geom = ls_find_geometry (phi, h); + geom = ls_absolute_geom (geom, XX, YY); + + mesh = ls_build_mesh (geom, phi, false); + meshGlob = ls_build_mesh (geom, phi, true); + + figure (); + hold ("on"); + trimesh (meshGlob.t(1 : 3, :)', meshGlob.p(1, :), meshGlob.p(2, :), "r"); + trimesh (mesh.t(1 : 3, :)', mesh.p(1, :), mesh.p(2, :), "g"); + for i = 1 : size (mesh.e, 2) + plot (mesh.p(1, mesh.e(1 : 2, i)), mesh.p(2, mesh.e(1 : 2, i)), "b"); + endfor + hold ("off"); + legend ("Global", "Domain", "Boundary"); + axis ("equal"); + axis ("square"); +4 tests, 4 passed, 0 known failure, 0 skipped +[inst/upwind_gradient_norm.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/upwind_gradient_norm.m ***** error - so_run_descent (1.5, phi0, data); + upwind_gradient_norm () +***** error + upwind_gradient_norm (1, 2, 3, 4) ***** error - so_run_descent ([2, 3], phi0, data); -***** error - d = data; - d.p.descent.initialStep = 0; - so_run_descent (1, phi0, d); + upwind_gradient_norm ([1, 1], [2, 2], [3, 3]) +***** error + upwind_gradient_norm ([1, 1], [2, 2, 2]) +***** error + upwind_gradient_norm ([1, 1], [2, 2, 2], 5) ***** test - nSteps = 12; + phi = [0, 2, 3]; + fPos = ones (size (phi)); - [s, descentLog] = so_run_descent (nSteps, phi0, data); - assert (s.cost, 0, 1e-3); - assert (length (descentLog.costs), nSteps + 1); - assert (descentLog.costs(end), s.cost); - %semilogy (descentLog.costs, "o"); + % Propagate the original phi to the right. This should result + % in the *backward* difference to be used in the middle. + g = upwind_gradient_norm (phi); + assert (g(2), 2); + gp = upwind_gradient_norm (phi, fPos); + assert (gp, g); + gp = upwind_gradient_norm (phi, 0.5); + assert (gp, 2 * g); + gp = upwind_gradient_norm (phi, fPos, 0.5); + assert (gp, 2 * g); + + % Propagate to the left for the reverse effect. + g = upwind_gradient_norm (phi, -fPos); + assert (g(2), 1); + + % Propagate -phi, which again turns everything around. + g = upwind_gradient_norm (-phi, fPos); + assert (g(2), 1); + g = upwind_gradient_norm (-phi, -fPos); + assert (g(2), 2); ***** test - tol = 5e-2; - nSteps = 100; - d = data; - d.cb.check_stop = @(data) (data.cost < tol); + n = 50; + x = linspace (-1, 1, n); + h = x(2) - x(1); + [XX, YY, ZZ] = ndgrid (x, x, x); - [s, descentLog] = so_run_descent (nSteps, phi0, d); - assert (s.cost < tol); - printf ("Steps needed: %d\n", descentLog.steps); - assert (descentLog.steps < nSteps); -Steps needed: 8 + phi = XX.^2 + YY.^2 + ZZ.^2; + g = upwind_gradient_norm (phi, h); + + r = sqrt (phi); + assert (g, 2 * r, 0.1); +7 tests, 7 passed, 0 known failure, 0 skipped +[inst/so_explore_descent.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/so_explore_descent.m +***** error + so_explore_descent (1); +***** error + so_explore_descent (1, 2, 3); +***** error + so_explore_descent (struct (), 2); +***** error + so_explore_descent ([2, 3], 2); +***** error <'fload' is not available> + pkg unload -nodeps parallel; + so_explore_descent ("foo", 2); ***** demo + pkg load parallel; + data = struct (); - data.p = so_init_params (true); + data.p = so_init_params (false); data.p.vol = 10; data.p.weight = 50; + data.p.nSteps = 10; + data.figs = struct (); + data.figs.speed = figure (); + data.figs.exploreCosts = figure (); + n = 100; x = linspace (-10, 10, n); h = x(2) - x(1); data.g = struct ("x", x, "h", h); - % Look at so_example_problem to see how the callbacks - % and the plotting handler is defined. data = so_example_problem (data); - phi0 = ls_genbasic (data.g.x, "box", -3, 7); - [s, descentLog] = so_run_descent (5, phi0, data); + + printf ("Computing descent...\n"); + f = tmpfile (); + d = data; + d.handler = struct (); + d = so_save_descent (f, struct (), d); + s = so_run_descent (data.p.nSteps, phi0, d); + printf ("Final cost: %.6d\n", s.cost); + + printf ("\nNow replaying...\n"); + init = @() data; + frewind (f); + so_explore_descent (f, init); + fclose (f); +5 tests, 5 passed, 0 known failure, 0 skipped +[inst/ls_disjoint.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_disjoint.m +***** error + ls_disjoint () +***** error + ls_disjoint (1, -2, [1, 2]) +***** test + assert (ls_disjoint ([-1, 0, 1], [0, 0, 0], [1, 0, -1])); + assert (~ls_disjoint ([Inf, -Inf, 1], [-1, -1, 1])); + assert (~ls_disjoint ([-1, -1, 1], [0, 0, 0], [1, -1, -1])); +***** test + n = 50; + x = linspace (-10, 10, n); + [XX, YY] = meshgrid (x, x); + + phi1 = (XX - 2).^2 + (YY - 2).^2 - 2^2; + phi2 = (XX + 2).^2 + (YY + 2).^2 - 2^2; + phi3 = XX.^2 + YY.^2 - 2^2; + + assert (ls_disjoint (phi1, phi2)); + assert (~ls_disjoint (phi1, phi3)); + assert (~ls_disjoint (phi2, phi3)); + assert (~ls_disjoint (phi1, phi2, phi3)); +4 tests, 4 passed, 0 known failure, 0 skipped +[inst/ls_absolute_geom.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_absolute_geom.m +***** error + ls_absolute_geom (1, 2); +***** error + ls_absolute_geom (1, 2, 3, 4); +***** error + x = [-1, 1]; + [XX, YY, ZZ] = ndgrid (x); + ls_absolute_geom (struct (), XX, YY); +***** error + ls_absolute_geom (struct (), [-1, 0, 1], [0, 0, 0]); +***** error + ls_absolute_geom (struct (), zeros (3, 2), zeros (2, 2)); +5 tests, 5 passed, 0 known failure, 0 skipped +[inst/ls_union.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_union.m +***** error + ls_union () +***** error + ls_union (1, -2, [1, 2]) +***** test + n = 50; + x = linspace (-10, 10, n); + [XX, YY] = meshgrid (x, x); + + phi1 = (XX - 3).^2 + (YY - 3).^2 - 2^2; + phi2 = (XX + 3).^2 + (YY + 3).^2 - 2^2; + phi3 = XX.^2 + YY.^2 - 2^2; + + phi = ls_union (phi1, phi2, phi3); + assert (ls_issubset (phi1, phi)); + assert (ls_issubset (phi2, phi)); + assert (ls_issubset (phi3, phi)); + + assert (ls_union (phi3), phi3); +***** demo + n = 100; + x = linspace (-7, 7, n); + [XX, YY] = meshgrid (x, x); + + phi1 = (XX - 2 * cos (7/6 * pi)).^2 + (YY - 2 * sin (7/6 * pi)).^2 - 3^2; + phi2 = (XX - 2 * cos (11/6 * pi)).^2 + (YY - 2 * sin (11/6 * pi)).^2 - 3^2; + phi3 = XX.^2 + (YY - 2).^2 - 3^2; + phi = ls_union (phi1, phi2, phi3); figure (); - semilogy (0 : descentLog.steps, descentLog.costs, "o"); - title ("Cost Descrease"); + subplot (1, 2, 1); + hold ("on"); + contour (XX, YY, phi1, [0, 0], "k"); + contour (XX, YY, phi2, [0, 0], "k"); + contour (XX, YY, phi3, [0, 0], "k"); + hold ("off"); + axis ("equal"); - printf ("\nFinal interval: [%.6d, %.6d]\n", s.a, s.b); - printf ("Final cost: %.6d\n", s.cost); -8 tests, 8 passed, 0 known failure, 0 skipped + subplot (1, 2, 2); + hold ("on"); + imagesc (x, x, phi); + set (gca (), "ydir", "normal"); + ls_sign_colourmap (); + contour (XX, YY, phi, [0, 0], "k"); + hold ("off"); + axis ("equal"); +3 tests, 3 passed, 0 known failure, 0 skipped +[inst/ls_issubset.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_issubset.m +***** error + ls_issubset (1) +***** error + ls_issubset (1, 2, 3) +***** error + ls_issubset (1, [1, 2]) +***** test + n = 50; + x = linspace (-10, 10, n); + [XX, YY] = meshgrid (x, x); + + phi1 = XX.^2 + YY.^2 - 1^2; + phi2 = XX.^2 + YY.^2 - 5^2; + phi3 = XX.^2 + YY.^2 - 8^2; + phi4 = (XX - 3).^2 + YY.^2 - 3^2; + + assert (ls_issubset (phi1, phi2)); + assert (ls_issubset (phi4, phi3)); + assert (~ls_issubset (phi4, phi2)); +4 tests, 4 passed, 0 known failure, 0 skipped +[inst/so_step_armijo.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/so_step_armijo.m +***** function s = updateState (phi, data) + inside = ls_inside (phi); + vol = data.g.h * length (find (inside)); + cost = 1 / vol; + + % Throw if the volume is too large. This is used + % to check the error handling code. + if (vol > 15) + error ("volume too large"); + endif + + s = struct ("phi", phi, "cost", cost); +***** endfunction +***** shared n, phi, baseData, d, f, dJ + n = 100; + x = linspace (-10, 10, n); + h = x(2) - x(1); + a = 0; + b = 5; + phi = ls_genbasic (x, "box", a, b); + + baseData = struct (); + baseData.p = so_init_params (false); + baseData.g = struct ("x", x, "h", h); + baseData.cb = struct ("update_state", @updateState); + baseData.s = updateState (phi, baseData); + baseData.s.phi = phi; + + f = ones (size (phi)); + d = ls_solve_stationary (phi, f, h); + + curVol = b - a; + dJ = -2 / curVol^2; +***** error + so_step_armijo (1, 2, 3, 4) +***** error + so_step_armijo (1, 2, 3, 4, 5, 6) +***** error + so_step_armijo ([1, 1], 2, 3, 4, struct ()) +***** error + so_step_armijo (1, 2, 3, [4, 4], struct ()) +***** error + so_step_armijo (1, 2, 3, 4, 5) +***** error + so_step_armijo (1, d, f, 4, baseData) +***** error + so_step_armijo (1, 2, f, dJ, baseData) +***** error + so_step_armijo (1, 2, 3, dJ, baseData) +***** error + data = baseData; + data.p.lineSearch.relaxation = 0; + so_step_armijo (1, d, f, dJ, data); +***** error + data = baseData; + data.p.lineSearch.relaxation = 1; + so_step_armijo (1, d, f, dJ, data); +***** error + data = baseData; + data.p.lineSearch.backtrack = 0; + so_step_armijo (1, d, f, dJ, data); +***** error + data = baseData; + data.p.lineSearch.backtrack = 1; + so_step_armijo (1, d, f, dJ, data); +***** error + data = baseData; + data.p.lineSearch.initial = 1; + so_step_armijo (1, d, f, dJ, data); +***** error + data = baseData; + data.p.lineSearch.minStep = -1; + so_step_armijo (1, d, f, dJ, data); +***** test + data = baseData; + data.p.lineSearch.minStep = 0; + so_step_armijo (1, d, f, dJ, data); +***** test + data = baseData; + data.p.verbose = true; + data.p.lineSearch.relaxation = 0.9; + [~, t] = so_step_armijo (1, d, f, dJ, data); + assert (t < 0.5); +Armijo step 2.000000: cost = 0.110000 +Armijo step 1.600000: cost = 0.120732 +Armijo step 1.280000: cost = 0.133784 +Armijo step 1.024000: cost = 0.141429 +Armijo step 0.819200: cost = 0.150000 +Armijo step 0.655360: cost = 0.159677 +Armijo step 0.524288: cost = 0.165000 +Armijo step 0.419430: cost = 0.170690 +Armijo step 0.335544: cost = 0.176786 +Armijo step 0.268435: cost = 0.183333 +Armijo step 0.214748: cost = 0.183333 +Armijo step 0.171799: cost = 0.183333 +***** test + so_step_armijo (2, d, f, dJ, baseData); +***** error + so_step_armijo (3, d, f, dJ, baseData); +18 tests, 18 passed, 0 known failure, 0 skipped [inst/ls_enforce_speed.m] >>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_enforce_speed.m ***** error @@ -5182,543 +5497,59 @@ F = ls_enforce_speed (F, "contain", XX.^2 + YY.^2 < 5^2); ls_animate_evolution (phi, F, h, times, 0.05); 6 tests, 6 passed, 0 known failure, 0 skipped -[inst/ls_genbasic.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_genbasic.m -***** shared x, y, XX, YY, XXX, YYY, ZZZ - n = 121; - x = linspace (-5, 7, n); - y = linspace (-7, 5, n); - [XX, YY] = meshgrid (x, y); - [XXX, YYY, ZZZ] = ndgrid (x, y, x); -***** error - ls_genbasic (); -***** error - ls_genbasic (1, 2); -***** error - ls_genbasic ("sphere"); -***** error - ls_genbasic (XX, YY, "unknown"); -***** test - ls_genbasic (x, "sphere", 0, 1); - ls_genbasic (x', "sphere", 0, 1); - ls_genbasic (XX, YY, "sphere", [0, 0], 1); - ls_genbasic (0, 1, "sphere", [0, 0], 1); -***** error - ls_genbasic (XX, YY, "sphere"); -***** error - ls_genbasic (XX, YY, "sphere", 1); -***** error - ls_genbasic (XX, YY, "sphere", 1, 2, 3); -***** error - ls_genbasic (XX, YY, "sphere", [1, 2, 3], 1); -***** error - ls_genbasic (XX, YY, "sphere", [1, 2], [1, 2, 3]); -***** test - assert (ls_genbasic (XX, YY, "sphere", [1, -1], 1), ... - ls_genbasic (XX, YY, "sphere", [1, -1], [1, 1])); -***** test - c = [1; -1; 2]; - r = [1; 2; 0.6]; - tol = 0.4; - phi1 = ls_genbasic (XXX, YYY, ZZZ, "sphere", c, r); - phi2 = ls_genbasic (XXX, YYY, ZZZ, "sphere", c, min (r) - tol); - assert (ls_issubset (phi2, phi1)); - coords = {XXX, YYY, ZZZ}; - for i = 1 : length (c) - assert (ls_disjoint (phi1, ... - coords{i} - (c(i) - r(i)), ... - c(i) + r(i) - coords{i})); - assert (~ls_disjoint (phi1 - tol, coords{i} - (c(i) - r(i)))); - assert (~ls_disjoint (phi1 - tol, c(i) + r(i) - coords{i})); - endfor -***** error - ls_genbasic (XX, YY, "box", 1); -***** error - ls_genbasic (XX, YY, "box", 1, 2, 3); -***** error - ls_genbasic (XX, YY, "box", [1, 2, 3], [1, 2]); -***** error - ls_genbasic (XX, YY, "box", [1; 2], [1, 2, 3]); -***** test - assert (ls_equal (ls_genbasic (x, "box", -1, 2), abs (x - 0.5) - 1.5)); - assert (ls_equal (ls_genbasic (x, "box", 2, -1), abs (x - 0.5) - 1.5)); -***** test - a = [2; -3; 1]; - b = [0; 2; -1]; - tol = 0.2; - phi1 = ls_genbasic (XXX, YYY, ZZZ, "box", a, b); - phi2 = ls_genbasic (XXX, YYY, ZZZ, "box", b, a); - assert (phi1, phi2); - coords = {XXX, YYY, ZZZ}; - for i = 1 : length (coords) - assert (ls_disjoint (phi1, ... - coords{i} - min (a(i), b(i)), ... - max (a(i), b(i)) - coords{i})); - assert (~ls_disjoint (phi1 - tol, coords{i} - min (a(i), b(i)))); - assert (~ls_disjoint (phi1 - tol, max (a(i), b(i)) - coords{i})); - endfor -***** error - ls_genbasic (XX, YY, "half", 1); +[inst/ls_intersect.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_intersect.m ***** error - ls_genbasic (XX, YY, "half", 1, 2, 3); -***** error - ls_genbasic (XX, YY, "half", [1, 2, 3], [1, 2]); -***** error - ls_genbasic (XX, YY, "half", [1; 2], [1, 2, 3]); + ls_intersect () +***** error + ls_intersect (1, -2, [1, 2]) ***** test - p = [0, 2, 1]; + n = 50; + x = linspace (-10, 10, n); + [XX, YY] = meshgrid (x, x); - phi = ls_genbasic (XXX, YYY, ZZZ, "half", p, [0; 0; 1]); - assert (ls_equal (phi, 1 - ZZZ)); + phi1 = (XX - 2).^2 + (YY - 2).^2 - 2^2; + phi2 = (XX + 2).^2 + (YY + 2).^2 - 2^2; + phi3 = XX.^2 + YY.^2 - 2^2; - normal = [1; 2; -0.5]; - phi1 = ls_genbasic (XXX, YYY, ZZZ, "half", p, normal); - phi2 = ls_genbasic (XXX, YYY, ZZZ, "half", p, 2 * normal); - assert (ls_equal (phi1, phi2)); + assert (ls_isempty (ls_intersect (phi1, phi2))); + assert (ls_intersect (phi3), phi3); - phi = ls_genbasic (XX, YY, "half", [0, 0], [1, -1]); - assert (ls_equal (phi, YY - XX)); + phi = ls_intersect (phi1, phi3); + assert (~ls_isempty (phi)); + assert (ls_issubset (phi, phi1) && ls_issubset (phi, phi3)); + + phi = ls_intersect (phi2, phi3); + assert (~ls_isempty (phi)); + assert (ls_issubset (phi, phi2) && ls_issubset (phi, phi3)); ***** demo - n = 200; + n = 100; x = linspace (-7, 7, n); [XX, YY] = meshgrid (x, x); - phi1 = ls_genbasic (XX, YY, "box", [-5, -3], [3, 6]); - phi2 = ls_genbasic (XX, YY, "sphere", [-1; 1], 2); - phi3 = ls_genbasic (XX, YY, "sphere", [0; 0], [6, 1]); - phi4 = ls_genbasic (XX, YY, "half", [3, -3], [1, -2]) / 8; + phi1 = (XX - 2 * cos (7/6 * pi)).^2 + (YY - 2 * sin (7/6 * pi)).^2 - 3^2; + phi2 = (XX - 2 * cos (11/6 * pi)).^2 + (YY - 2 * sin (11/6 * pi)).^2 - 3^2; + phi3 = XX.^2 + (YY - 2).^2 - 3^2; + phi = ls_intersect (phi1, phi2, phi3); - phi = ls_union (ls_setdiff (phi1, phi2), phi3, phi4); figure (); + subplot (1, 2, 1); hold ("on"); - imagesc (x, x, phi); - set (gca (), "ydir", "normal"); - ls_sign_colourmap (); - contour (XX, YY, phi, [0, 0], "k"); + contour (XX, YY, phi1, [0, 0], "k"); + contour (XX, YY, phi2, [0, 0], "k"); + contour (XX, YY, phi3, [0, 0], "k"); hold ("off"); axis ("equal"); -23 tests, 23 passed, 0 known failure, 0 skipped -[inst/so_example_problem.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/so_example_problem.m -***** shared basicData - basicData = struct (); - basicData.p = so_init_params (true); - basicData.p.vol = 4; - basicData.p.weight = 10; - - n = 50; - x = linspace (-4, 5, n); - h = x(2) - x(1); - basicData.g = struct ("x", x, "h", h); -***** error - so_example_problem (); -***** error - so_example_problem (1, 2); -***** error - so_example_problem (1); -***** test - data = so_example_problem (basicData); - phi = ls_genbasic (data.g.x, "box", -2.5, 1.3); - - [a, b] = data.util.bounds (phi, data); - assert (a, -2.5, sqrt (eps)); - assert (b, 1.3, sqrt (eps)); -***** test - data = so_example_problem (basicData); - - phi = ls_genbasic (data.g.x, "box", -2, 2); - s0 = data.cb.update_state (phi, data); - - phi = ls_genbasic (data.g.x, "box", -3, 3); - s1 = data.cb.update_state (phi, data); - - phi = ls_genbasic (data.g.x, "box", -1, 1); - s2 = data.cb.update_state (phi, data); - - phi = ls_genbasic (data.g.x, "box", -1, 3); - s3 = data.cb.update_state (phi, data); - - phi = ls_genbasic (data.g.x, "box", -3, 1); - s4 = data.cb.update_state (phi, data); - - assert (all ([s0.cost, s1.cost, s2.cost, s3.cost, s4.cost] >= 0)); - assert (s0.cost, 0, 1e-1); - assert (s1.cost > s3.cost); - assert (s1.cost > s4.cost); - assert (s2.cost > s3.cost); - assert (s2.cost > s4.cost); - assert (s3.cost > s0.cost); - assert (s4.cost > s0.cost); -***** function testDeriv (a, b, data) - phi = ls_genbasic (data.g.x, "box", a, b); - data.s = data.cb.update_state (phi, data); - [f, dJ] = data.cb.get_direction (data); - assert (dJ < 0); - - dt = 5e-3; - dists = ls_solve_stationary (phi, f, data.g.h); - phip = ls_extract_solution (dt, dists, phi, f); - sp = data.cb.update_state (phip, data); - - assert (sp.cost < data.s.cost); - relErr = abs (sp.cost - (data.s.cost + dt * dJ)) / data.s.cost; - assert (relErr < 0.1); -***** endfunction -***** test - data = so_example_problem (basicData); - - testDeriv (-1, 1, data); - testDeriv (-3, 3, data); - testDeriv (-1, 3, data); - testDeriv (-3, 1, data); -6 tests, 6 passed, 0 known failure, 0 skipped -[inst/ls_time_step.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_time_step.m -***** error - ls_time_step (1, 2) -***** error - ls_time_step (1, 2, 3, 4, 5, 6) -***** error - ls_time_step (1, 2, 3, 4, [5, 5]) -***** error - ls_time_step ([1; 1], [2, 2], [3, 3, 3]) -***** error - ls_time_step ([1, 1], 1, [2, 2], [3, 3, 3]) -***** error - ls_time_step (ones (2, 2), 1, 1) -***** test - n = 100; - x = linspace (0, 1, n); - h = x(2) - x(1); - - phi0 = sin (x); - fPos = ones (size (phi0)); - - % Single time step, moving exactly one grid step. - phit = ls_time_step (1, phi0, fPos); - assert (phit(2 : end), phi0(1 : end - 1)); - - % t = 1 should correspond to the previous result, and t = 2 - % shifts one more time step. However, due to boundary effects, - % we have to exclude some elements in the comparisons. - phitArr = ls_time_step ([1, 2], 0.5, phi0, fPos); - assert (size (phitArr), [2, 1]); - assert (phitArr{1}(3 : end), phit(3 : end), 1e-4); - assert (phitArr{2}(5 : end), phi0(3 : end - 2), 1e-4); - - % Try out movement in the other direction. - phit = ls_time_step (0.5, 0.1, phi0, -fPos, 0.5); - assert (phit(1 : end - 4), phi0(2 : end - 3), 1e-4); -***** function compareFastMarching (t, phi0, F, h, tol) - phit = ls_time_step (t, phi0, F, h); - d = ls_solve_stationary (phi0, F, h); - phit_fm = ls_extract_solution (t, d, phi0, F); - - sd1 = ls_signed_distance (phit, h); - sd2 = ls_signed_distance (phit_fm, h); - assert (sd1, sd2, tol); -***** endfunction -***** test - warning ("off", "level-set:fast-marching:too-far-alive"); - - n = 100; - x = linspace (-5, 5, n); - h = x(2) - x(1); - [XX, YY] = meshgrid (x, x); - - phi0 = ls_genbasic (XX, YY, "sphere", [0, 0], [3, 1.5]); - F = ones (size (phi0)); - compareFastMarching (0.5, phi0, F, h, h / 2); - compareFastMarching (1.5, phi0, F, h, h / 2); - - phi0 = ls_genbasic (XX, YY, "box", [-3, -3], [3, 3]); - F = YY / 5; - compareFastMarching (1, phi0, F, h, h); - - F = ones (size (phi0)); - compareFastMarching (1, phi0, F, h, h / 2); - - phi0 = ls_genbasic (XX, YY, "sphere", [0, 0], 3); - F = sin (XX .* YY); - compareFastMarching (1, phi0, F, h, h); -***** test - warning ("off", "level-set:fast-marching:increased-distance"); - n = 50; - x = linspace (-5, 5, n); - h = x(2) - x(1); - [XX, YY, ZZ] = ndgrid (x, x, x); - - phi0 = ls_genbasic (XX, YY, ZZ, "sphere", [0, 0, 0], 3); - F = ones (size (phi0)); - compareFastMarching (1, phi0, F, h, h / 2); - compareFastMarching (1, phi0, -F, h, h / 2); -***** demo - n = 500; - x = linspace (-5, 5, n); - h = x(2) - x(1); - [XX, YY] = meshgrid (x, x); - - F = sin (XX .* YY); - phi0 = ls_genbasic (XX, YY, "sphere", [0, 0], 3); - phit = ls_time_step ([0.5, 1], phi0, F, h); - - figure (); + subplot (1, 2, 2); hold ("on"); - imagesc (x, x, F); - axis ("equal"); + imagesc (x, x, phi); set (gca (), "ydir", "normal"); ls_sign_colourmap (); - contour (XX, YY, phi0, [0, 0], "k", "LineWidth", 2); - contour (XX, YY, phit{1}, [0, 0], "k", "LineWidth", 2); - contour (XX, YY, phit{2}, [0, 0], "k", "LineWidth", 2); + contour (XX, YY, phi, [0, 0], "k"); hold ("off"); -9 tests, 9 passed, 0 known failure, 0 skipped -[inst/ls_find_geometry.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_find_geometry.m -***** error - ls_find_geometry () -***** error - ls_find_geometry (1, 2, 3, 4) -***** error - ls_find_geometry (resize (zeros (8, 1), [2, 2, 2])) -***** error - ls_find_geometry ([1, -1, 1]) -***** error - ls_find_geometry ([0, 1; -1, -1]) -***** error - ls_find_geometry ([-1, NA; -1, -1]) -***** function verifyGeometry (phi, geom) - sz = size (phi); - nNode = prod (sz); - L = sz(1); - M = sz(2); - nElem = (L - 1) * (M - 1); - assert (geom.dim, sz); - - % Basic properties of the elem field. - assert (geom.elem.n, nElem); - assert (size (geom.elem.nodelist), [nElem, 4]); - assert (all (geom.elem.type(geom.elem.index.inner) == -1)); - assert (all ((geom.elem.type(geom.elem.index.bdry) == 0))); - assert (all ((geom.elem.type(geom.elem.index.outer) == 1))); - % Order of the nodes in nodelist. - assert (geom.elem.nodelist(1, :), [L+2, 2, 1, L+1]); - % Correct classification of inner/outer/bdry elements. - assert (all (phi(geom.elem.nodelist(geom.elem.index.inner, :))(:) < 0)); - assert (all (phi(geom.elem.nodelist(geom.elem.index.outer, :))(:) > 0)); - bdryPhis = phi(geom.elem.nodelist(geom.elem.index.bdry, :)); - bdryPhis = sort (bdryPhis, 2); - assert (all (bdryPhis(:, 1) < 0) && all (bdryPhis(:, end) > 0)); - - % Each boundary element should have two or four intersected edges. - % Also verify that the start/endEdge fields of the internal information - % match up to the points in question. - for i = 1 : geom.bdryel.n - empty = length (find (isna (geom.bdryel.edges(i, :)))); - assert (empty == 2 || empty == 0); - for j = 1 : length (geom.internal.bdryelSegments{i}) - s = geom.internal.bdryelSegments{i}{j}; - assert (geom.bdryel.edges(i, s.startEdge) == s.startPt); - assert (geom.bdryel.edges(i, s.endEdge) == s.endPt); - endfor - endfor - - % Run through gamma components and verify that geom.ispts.onedge matches. - for i = 1 : geom.gamma.n - c = geom.gamma.ispts{i}; - c(end + 1) = c(1); - for j = 1 : length (c) - 1 - cur = c(j); - next = c(j + 1); - bdryel = geom.ispts.onedge(cur, 1, 1); - assert (geom.ispts.onedge(next, 2, 1), bdryel); - assert (geom.bdryel.edges(bdryel, geom.ispts.onedge(cur, 1, 2)), cur); - assert (geom.bdryel.edges(bdryel, geom.ispts.onedge(next, 2, 2)), next); - - edgeForward = geom.ispts.onedge(cur, 1, 3); - assert (geom.bedges.ispts(edgeForward, 1), cur); - assert (geom.bedges.ispts(edgeForward, 2), next); - - assert (geom.ispts.gammachain(cur, 1), next); - assert (geom.ispts.gammachain(next, 2), cur); - endfor - endfor - - % Verify that the ordering of points in bedges matches the onedge - % information about start / end points in each boundary element. - for i = 1 : geom.bedges.n - assert (geom.ispts.onedge(geom.bedges.ispts(i, 1), 1, 1), ... - geom.ispts.onedge(geom.bedges.ispts(i, 2), 2, 1)); - assert (geom.ispts.onedge(geom.bedges.ispts(i, 1), 1, 3), i); - assert (geom.ispts.onedge(geom.bedges.ispts(i, 2), 2, 3), i); - endfor -***** endfunction -***** test - phis = ls_get_tests (); - hs = [0.1, 0.5, 1, 1.5]; - for i = 1 : length (phis) - for h = hs - for s = [-1, 1] - cur = phis{i} * s; - phi = ls_normalise (cur, h); - geom = ls_find_geometry (phi, h); - verifyGeometry (phi, geom); - endfor - endfor - endfor -***** test - phi = ones (4, 4); - phi(2 : 3, 2 : 3) = [Inf, -1; -Inf, 2]; - g = ls_find_geometry (phi, 0.1, 0.01); - - ind = find (g.elem.index.bdry == 5); - assert (size (ind), [1, 1]); - edges = g.bdryel.edges(ind, :); - assert (all (~isna (edges))); - - assert (g.ispts.inout(edges, :), [7, 11; 7, 6; 10, 6; 10, 11]); - assert (g.ispts.frac(edges), [0.99; 0.5; 0.01; 1/3], sqrt (eps)); - assert (g.ispts.incoord(edges, :), ... - [0.099, 0; 0, -0.05; -0.001, 0; 0, 1/30], sqrt (eps)); -***** error - phi = [-1, -1; 1, 1]; - ls_find_geometry (phi); -***** test - phi = ones (3, 3); - phi(2, 2) = -1; - geom = ls_find_geometry (phi); - - % Permute the component array such that it starts with the north point - % and then compare coordinates. Note that the "north" point is "south" - % in matrix interpretation and thus has "outindex" of 6. - assert (geom.gamma.n, 1); - c = geom.gamma.ispts{1}'; - while (geom.ispts.inout(c(1), 2) != 6) - c = [c(2 : end), c(1)]; - endwhile - assert (geom.ispts.incoord(c, :), ... - [0, 1/2; -1/2, 0; 0, -1/2; 1/2, 0], sqrt (eps)); -***** function checkBoundaryDirection (pts, dir) - pts(end + 1, :) = pts(1, :); - for i = 1 : length (pts) - 1 - a = [pts(i, :), 0]; - b = [pts(i + 1, :), 0]; - z = cross (a, b); - assert (z(1 : 2), [0, 0]); - assert (sign (z(3)), dir); - endfor -***** endfunction -***** test - n = 50; - x = linspace (-10, 10, n); - h = x(2) - x(1); - [XX, YY] = meshgrid (x, x); - - phi = ls_setdiff (ls_genbasic (XX, YY, "sphere", [0, 0], 8), ... - ls_genbasic (XX, YY, "sphere", [0, 0], 4)); - phi = ls_normalise (phi, h); - geom = ls_find_geometry (phi, h); - geom = ls_absolute_geom (geom, XX, YY); - - assert (geom.gamma.n, 2); - len1 = length (geom.gamma.ispts{1}); - len2 = length (geom.gamma.ispts{2}); - if (len1 < len2) - outer = geom.gamma.ispts{2}; - inner = geom.gamma.ispts{1}; - else - assert (len1 > len2); - outer = geom.gamma.ispts{1}; - inner = geom.gamma.ispts{2}; - endif - - checkBoundaryDirection (geom.ispts.coord(outer, :), 1); - checkBoundaryDirection (geom.ispts.coord(inner, :), -1); -***** test - phi = ones (4, 4); - phi(2, 2) = -1; - phi(3, 3) = -1; - - geom = ls_find_geometry (phi); - assert (geom.gamma.n, 2); - geom = ls_find_geometry (-phi); - assert (geom.gamma.n, 1); - - % Now also try with other "kind" of narrow pair. - phi = phi(:, end : -1 : 1); - geom = ls_find_geometry (phi); - assert (geom.gamma.n, 2); - geom = ls_find_geometry (-phi); - assert (geom.gamma.n, 1); -***** demo - n = 15; - x = linspace (-10, 10, n); - h = x(2) - x(1); - [XX, YY] = meshgrid (x, x); - - r1 = sqrt (2) * 2.9; - r2 = 3; - phi = ls_union (ls_genbasic (XX, YY, "sphere", [-3, -3], r1), ... - ls_genbasic (XX, YY, "sphere", [3, 3], r1), ... - ls_genbasic (XX, YY, "sphere", [-5, 5], r2), ... - ls_genbasic (XX, YY, "sphere", [5, -5], r2)); - - phi = ls_normalise (phi, h); - g = ls_find_geometry (phi, h, 0.2); - g = ls_absolute_geom (g, XX, YY); - - figure (); - hold ("on"); - - for i = 1 : size (g.elem.nodelist, 1) - nodes = g.elem.nodelist(i, :); - switch (g.elem.type(i)) - case -1 - colour = [0.5, 0.5, 1]; - case 0 - colour = [1, 0.5, 0.5]; - case 1 - colour = [0.8, 0.8, 0.8]; - endswitch - patch (XX(nodes), YY(nodes), colour); - endfor - - plot (g.ispts.coord(:, 1), g.ispts.coord(:, 2), "k.", "MarkerSize", 8); - for i = 1 : g.gamma.n - pts = g.gamma.ispts{i}; - pts(end + 1) = pts(1); - plot (g.ispts.coord(pts, 1), g.ispts.coord(pts, 2), "k-", "LineWidth", 2); - endfor - - contour (XX, YY, phi, [0, 0], "g"); - - axis ([min(x), max(x), min(x), max(x)]); axis ("equal"); - grid ("on"); - set (gca (), "xtick", x, "ytick", x, "xticklabel", "", "yticklabel", ""); - hold ("off"); -12 tests, 12 passed, 0 known failure, 0 skipped -[inst/so_save_descent.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/so_save_descent.m -***** error - so_save_descent (1, 2); -***** error - so_save_descent (1, 2, 3, 4); -***** error - so_save_descent (1, 2, 3); -***** error - so_save_descent (struct (), 2, struct ()); -***** error - so_save_descent ([2, 3], 2, struct ()); -***** error <'fsave' is not available> - pkg unload -nodeps parallel; - so_save_descent ("foo", 2, struct ()); -***** test - pkg load parallel; - so_save_descent ("foo", 2, struct ()); - so_save_descent (5, 2, struct ()); -7 tests, 7 passed, 0 known failure, 0 skipped +3 tests, 3 passed, 0 known failure, 0 skipped [inst/ls_signed_distance.m] >>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_signed_distance.m ***** error @@ -5791,175 +5622,347 @@ colorbar (); axis ("equal"); 8 tests, 8 passed, 0 known failure, 0 skipped -[inst/ls_build_mesh.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_build_mesh.m +[inst/ls_normalise.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_normalise.m ***** error - ls_build_mesh (1) -***** error - ls_build_mesh (1, 2, 3, 4) -***** error - x = linspace (-10, 10, 10); - h = x(2) - x(1); - [XX, YY] = meshgrid (x, x); - phi = ls_genbasic (XX, YY, "sphere", [0, 0], 5); - phi = ls_normalise (phi, h); - geom = ls_find_geometry (phi, h); - ls_build_mesh (geom, phi); -***** function verifyDirection (a, b, centre) - v1 = [a - centre; 0]; - v2 = [b - centre; 0]; - x = cross (v1, v2); - assert (x(1 : 2), zeros (2, 1)); - assert (x(3) > 0); + ls_normalise () +***** error + ls_normalise (1, 2, 3, 4) +***** test + h = 0.1; + zeroTol = 0.2; + phi = ones (4, 4); + phiEx = phi; + phi(2 : 3, 2 : 3) = [-eps, -0; 0, eps]; + phiEx(2 : 3, 2 : 3) = [-zeroTol*h, -zeroTol*h; zeroTol*h, zeroTol*h]; + phin = ls_normalise (phi, h, zeroTol); + if (exist ("signbit") == 5) + assert (phin, phiEx); + else + warning ("'signbit' function not available, skipping test."); + endif +3 tests, 3 passed, 0 known failure, 0 skipped +[inst/so_replay_descent.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/so_replay_descent.m +***** error + so_replay_descent (1); +***** error + so_replay_descent (1, 2, 3, 4); +***** error + so_replay_descent (1, 2, 0); +***** error + so_replay_descent (1, 2, 1.5); +***** error + so_replay_descent (1, 2, [2, 3]); +***** error + so_replay_descent (struct (), 2); +***** error + so_replay_descent ([2, 3], 2); +***** error <'fload' is not available> + pkg unload -nodeps parallel; + so_replay_descent ("foo", 2); +***** function x = compressionCheckStruct (s, data) + x = struct ("weight", data.p.weight, "cost", s.cost); ***** endfunction -***** function verifyMesh (geom, phi, glob) - [mesh, vmap] = ls_build_mesh (geom, phi, glob); - nPts = prod (geom.dim); - - % Verify ordering of triangle points. - for i = 1 : size (mesh.t, 2) - verifyDirection (mesh.p(:, mesh.t(1, i)), mesh.p(:, mesh.t(2, i)), ... - mesh.p(:, mesh.t(3, i))); - endfor - - % Go through all grid points and verify them with the mesh. - for i = 1 : nPts - gridInd = vmap.grid(i); - if (isna (gridInd)) - assert (!glob); - continue; - endif - - assert (vmap.mesh(gridInd), i); - assert (mesh.p(:, gridInd), geom.nodes.coord(i, :)'); - endfor - - % Go through all intersection points and verify them. - for i = 1 : geom.ispts.n - gridInd = vmap.ispt(i); - assert (vmap.mesh(gridInd), -i); - assert (mesh.p(:, gridInd), geom.ispts.coord(i, :)'); - endfor +***** function checkCompression (s, data, field) + assert (isfield (s, field)); + assert (getfield (s, field), compressionCheckStruct (s, data)); +***** endfunction +***** function s = compressState (s, data) + s.compressed = compressionCheckStruct (s, data); +***** endfunction +***** function s = uncompressState (s, data) + checkCompression (s, data, "compressed"); + s.uncompressed = compressionCheckStruct (s, data); +***** endfunction +***** function log = initialised (data) + log = data.log; + log.mashUp = [data.s.a, data.s.b]; +***** endfunction +***** function log = beforeStep (k, data) + log = data.log; + log.mashUp = [log.mashUp, k, data.s.vol]; - % Verify mesh.e against geom.bedges. - for i = 1 : geom.bedges.n - assert (mesh.e(1 : 2, i), vmap.ispt(geom.bedges.ispts(i, :)')); - assert (mesh.e(5, i), geom.bedges.comp(i)); - endfor + if (data.checkUncompression) + checkCompression (data.s, data, "uncompressed"); + endif ***** endfunction -***** function verifyPhi (phi, XX, YY, h) - for s = [-1, 1] - cur = phi * s; - cur = ls_normalise (cur, h); - geom = ls_find_geometry (cur, h); - geom = ls_absolute_geom (geom, XX, YY); +***** function log = direction (k, f, dJ, data) + log = data.log; + log.mashUp = [log.mashUp, k, mean(f), sum(f), dJ, data.s.integ]; +***** endfunction +***** function log = afterStep (k, t, s, data) + log = data.log; + log.mashUp = [log.mashUp, k, t, s.a, s.b, s.cost, data.s.cost]; - verifyMesh (geom, cur, false); - verifyMesh (geom, cur, true); - endfor + if (data.checkUncompression) + checkCompression (s, data, "uncompressed"); + endif ***** endfunction -***** test - n = 20; +***** function log = finished (data) + log = data.log; + log.mashUp = [log.mashUp, data.s.cost, log.steps, log.costs]; +***** endfunction +***** function data = getData () + data = struct (); + data.p = so_init_params (false); + data.p.vol = 10; + data.p.weight = 50; + + n = 100; x = linspace (-10, 10, n); h = x(2) - x(1); - [XX, YY] = meshgrid (x, x); + data.g = struct ("x", x, "h", h); - phi = ls_union (ls_genbasic (XX, YY, "sphere", [-6, -6], 3), ... - ls_genbasic (XX, YY, "sphere", [6, 6], 3)); - verifyPhi (phi, XX, YY, h); + data = so_example_problem (data); + data.handler = struct ("initialised", @initialised, ... + "before_step", @beforeStep, ... + "direction", @direction, ... + "after_step", @afterStep, ... + "finished", @finished); - phi = ls_setdiff (ls_genbasic (XX, YY, "sphere", [0, 0], 8), ... - ls_genbasic (XX, YY, "sphere", [0, 0], 4)); - verifyPhi (phi, XX, YY, h); + % Unless explicitly set, do not expect compressed states. + data.checkUncompression = false; + + data.phi0 = ls_genbasic (data.g.x, "box", -3, 5); +***** endfunction +***** function data = getDataForCompression (uncompress) + data = getData (); + data.compress = struct (); + data.compress.save = struct ("state", @compressState); + data.compress.load = struct ("state", @uncompressState); + data.checkUncompression = uncompress; +***** endfunction +***** function compareResults (s1, l1, s2, l2) + assert (s2, s1); + assert (l2.mashUp, l1.mashUp); +***** endfunction +***** xtest + pkg load parallel; + + nSteps = 10; + baseData = getData (); + + f = tempname (); + data = so_save_descent (f, struct (), baseData); + [s1, l1] = so_run_descent (nSteps, data.phi0, data); + [s2, l2] = so_replay_descent (f, @getData); + unlink (f); + compareResults (s1, l1, s2, l2); + + f = tmpfile (); + data = so_save_descent (f, struct (), baseData); + [s1, l1] = so_run_descent (nSteps, data.phi0, data); + frewind (f); + [s2, l2] = so_replay_descent (f, @getData); + fclose (f); + compareResults (s1, l1, s2, l2); + + [pr, pw] = pipe (); + data = so_save_descent (pw, struct (), baseData); + [s1, l1] = so_run_descent (nSteps, data.phi0, data); + fclose (pw); + [s2, l2] = so_replay_descent (pr, @getData); + fclose (pr); + compareResults (s1, l1, s2, l2); +!!!!! known failure +structure has no member 'openFile' +***** xtest + pkg load parallel; + + baseData = getData (); + [pr, pw] = pipe (); + data = so_save_descent (pw, struct (), baseData); + data.cb.check_stop = @() true; + [s1, l1] = so_run_descent (1, data.phi0, data); + fclose (pw); + assert (l1.steps, 0); + [s2, l2] = so_replay_descent (pr, @getData); + fclose (pr); + compareResults (s1, l1, s2, l2); + + baseData = getData (); + [pr, pw] = pipe (); + data = so_save_descent (pw, struct (), baseData); + [s1, l1] = so_run_descent (1, data.phi0, data); + fclose (pw); + [s2, l2] = so_replay_descent (pr, @getData, 1); + fclose (pr); + compareResults (s1, l1, s2, l2); +!!!!! known failure +structure has no member 'openFile' +***** xtest + pkg load parallel; + + nStepsShort = 5; + nStepsLong = 10; + + baseData = getData (); + [prl, pwl] = pipe (); + data = so_save_descent (pwl, struct (), baseData); + [sl, ll] = so_run_descent (nStepsLong, data.phi0, data); + fclose (pwl); + + baseData = getData (); + [prs, pws] = pipe (); + data = so_save_descent (pws, struct (), baseData); + [ss, ls] = so_run_descent (nStepsShort, data.phi0, data); + fclose (pws); + + [s, l] = so_replay_descent (prl, @getData, nStepsShort); + fclose (prl); + compareResults (s, l, ss, ls); + + [s, l] = so_replay_descent (prs, @getData, nStepsLong); + fclose (prs); + compareResults (s, l, sl, ll); +!!!!! known failure +structure has no member 'openFile' +***** xtest + pkg load parallel; + + nSteps = 10; + [pr, pw] = pipe (); + + data = getDataForCompression (false); + data = so_save_descent (pw, struct (), data); + [s1, l1] = so_run_descent (nSteps, data.phi0, data); + fclose (pw); + + init = @(header) getDataForCompression (true); + [s2, l2] = so_replay_descent (pr, init); + fclose (pr); + + % No result comparison here, since the compress / uncompress + % functions introduced changes to the state structs. +!!!!! known failure +structure has no member 'openFile' ***** demo - x = linspace (-10, 10, 11); + pkg load parallel; + + data = struct (); + data.p = so_init_params (false); + data.p.vol = 10; + data.p.weight = 50; + + n = 100; + x = linspace (-10, 10, n); h = x(2) - x(1); - [XX, YY] = meshgrid (x, x); + data.g = struct ("x", x, "h", h); - phi = ls_union (ls_genbasic (XX, YY, "sphere", [5, 5], 4.5), ... - ls_genbasic (XX, YY, "sphere", [-2, -2], 4)); - phi = ls_normalise (phi, h); - geom = ls_find_geometry (phi, h); - geom = ls_absolute_geom (geom, XX, YY); + data = so_example_problem (data); + phi0 = ls_genbasic (data.g.x, "box", -3, 7); - mesh = ls_build_mesh (geom, phi, false); - meshGlob = ls_build_mesh (geom, phi, true); + printf ("Computing descent...\n"); + [pr, pw] = pipe (); + d = data; + d.handler = struct (); + d = so_save_descent (pw, struct (), d); + s = so_run_descent (5, phi0, d); + fclose (pw); + printf ("Final cost: %.6d\n", s.cost); - figure (); - hold ("on"); - trimesh (meshGlob.t(1 : 3, :)', meshGlob.p(1, :), meshGlob.p(2, :), "r"); - trimesh (mesh.t(1 : 3, :)', mesh.p(1, :), mesh.p(2, :), "g"); - for i = 1 : size (mesh.e, 2) - plot (mesh.p(1, mesh.e(1 : 2, i)), mesh.p(2, mesh.e(1 : 2, i)), "b"); - endfor - hold ("off"); - legend ("Global", "Domain", "Boundary"); - axis ("equal"); - axis ("square"); -4 tests, 4 passed, 0 known failure, 0 skipped -[inst/ls_issubset.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_issubset.m + printf ("\nNow replaying...\n"); + d = data; + d.p.verbose = true; + init = @() d; + s = so_replay_descent (pr, init); + fclose (pr); + printf ("Final cost: %.6d\n", s.cost); +warning: test: file /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/so_replay_descent.m leaked file descriptors +12 tests, 8 passed, 4 known failures, 0 skipped +[inst/ls_check.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_check.m ***** error - ls_issubset (1) -***** error - ls_issubset (1, 2, 3) -***** error - ls_issubset (1, [1, 2]) + ls_check (1, 2) +***** error + ls_check (1, 2, 3, 4) +***** error + ls_check (1, "inside", [1, 2]); +***** error + ls_check (1, "foo", true); +***** error + ls_check (1, NA, false); ***** test - n = 50; + n = 100; x = linspace (-10, 10, n); [XX, YY] = meshgrid (x, x); - phi1 = XX.^2 + YY.^2 - 1^2; - phi2 = XX.^2 + YY.^2 - 5^2; - phi3 = XX.^2 + YY.^2 - 8^2; - phi4 = (XX - 3).^2 + YY.^2 - 3^2; + circ2 = (XX.^2 + YY.^2 < 2^2); + circ8 = (XX.^2 + YY.^2 < 8^2); + phi = (XX.^2 + YY.^2 - 5^2); - assert (ls_issubset (phi1, phi2)); - assert (ls_issubset (phi4, phi3)); - assert (~ls_issubset (phi4, phi2)); -4 tests, 4 passed, 0 known failure, 0 skipped -[inst/ls_intersect.m] ->>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_intersect.m + assert (ls_check (phi, "inside", circ8)); + assert (ls_check (phi, "contain", circ2)); + assert (ls_check (phi, "outside", ~circ8)); + + assert (~ls_check (phi, "inside", circ2)); + assert (~ls_check (phi, "contain", circ8)); + assert (~ls_check (phi, "outside", circ8)); +6 tests, 6 passed, 0 known failure, 0 skipped +[inst/ls_setdiff.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_setdiff.m ***** error - ls_intersect () -***** error - ls_intersect (1, -2, [1, 2]) + ls_setdiff (1) +***** error + ls_setdiff (1, 2, 3) +***** error + ls_setdiff (1, [1, 2]) ***** test + assert (ls_equal (ls_setdiff ([-1, -1, 1], [1, -1, -1]), [-1, 1, 1])); n = 50; x = linspace (-10, 10, n); + h = x(2) - x(1); [XX, YY] = meshgrid (x, x); - phi1 = (XX - 2).^2 + (YY - 2).^2 - 2^2; - phi2 = (XX + 2).^2 + (YY + 2).^2 - 2^2; - phi3 = XX.^2 + YY.^2 - 2^2; + phi1 = XX.^2 + YY.^2 - 8^2; + phi2 = XX.^2 + YY.^2 - 5^2; - assert (ls_isempty (ls_intersect (phi1, phi2))); - assert (ls_intersect (phi3), phi3); + phi = ls_setdiff (phi1, phi2); + assert (ls_issubset (phi, phi1)); + assert (ls_disjoint (phi, phi2)); - phi = ls_intersect (phi1, phi3); - assert (~ls_isempty (phi)); - assert (ls_issubset (phi, phi1) && ls_issubset (phi, phi3)); + phi = ls_setdiff (phi2, phi1); + assert (ls_isempty (phi)); +***** demo + n = 100; + x = linspace (-7, 7, n); + [XX, YY] = meshgrid (x, x); - phi = ls_intersect (phi2, phi3); - assert (~ls_isempty (phi)); - assert (ls_issubset (phi, phi2) && ls_issubset (phi, phi3)); + phi1 = (XX - 2).^2 + YY.^2 - 3^2; + phi2 = (XX + 2).^2 + YY.^2 - 3^2; + phi = ls_setdiff (phi1, phi2); + + figure (); + subplot (1, 2, 1); + hold ("on"); + contour (XX, YY, phi1, [0, 0], "k"); + contour (XX, YY, phi2, [0, 0], "k"); + hold ("off"); + axis ("equal"); + + subplot (1, 2, 2); + hold ("on"); + imagesc (x, x, phi); + set (gca (), "ydir", "normal"); + ls_sign_colourmap (); + contour (XX, YY, phi, [0, 0], "k"); + hold ("off"); + axis ("equal"); ***** demo n = 100; x = linspace (-7, 7, n); [XX, YY] = meshgrid (x, x); - phi1 = (XX - 2 * cos (7/6 * pi)).^2 + (YY - 2 * sin (7/6 * pi)).^2 - 3^2; - phi2 = (XX - 2 * cos (11/6 * pi)).^2 + (YY - 2 * sin (11/6 * pi)).^2 - 3^2; - phi3 = XX.^2 + (YY - 2).^2 - 3^2; - phi = ls_intersect (phi1, phi2, phi3); + phi1 = XX.^2 + YY.^2 - 6^2; + phi2 = XX.^2 + YY.^2 - 3^2; + phi = ls_setdiff (phi1, phi2); figure (); subplot (1, 2, 1); hold ("on"); contour (XX, YY, phi1, [0, 0], "k"); contour (XX, YY, phi2, [0, 0], "k"); - contour (XX, YY, phi3, [0, 0], "k"); hold ("off"); axis ("equal"); @@ -5971,10 +5974,45 @@ contour (XX, YY, phi, [0, 0], "k"); hold ("off"); axis ("equal"); -3 tests, 3 passed, 0 known failure, 0 skipped +4 tests, 4 passed, 0 known failure, 0 skipped +[inst/so_save_descent.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/so_save_descent.m +***** error + so_save_descent (1, 2); +***** error + so_save_descent (1, 2, 3, 4); +***** error + so_save_descent (1, 2, 3); +***** error + so_save_descent (struct (), 2, struct ()); +***** error + so_save_descent ([2, 3], 2, struct ()); +***** error <'fsave' is not available> + pkg unload -nodeps parallel; + so_save_descent ("foo", 2, struct ()); +***** test + pkg load parallel; + so_save_descent ("foo", 2, struct ()); + so_save_descent (5, 2, struct ()); +7 tests, 7 passed, 0 known failure, 0 skipped +[inst/ls_inside.m] +>>>>> /build/reproducible-path/octave-level-set-0.3.1~git.2019.04.13/inst/ls_inside.m +***** error + ls_inside () +***** error + ls_inside (1, 2) +***** test + assert (ls_inside ([1, 0, -1, 0, 1]), [false, false, true, false, false]); +***** test + if (exist ("signbit") == 5) + assert (ls_inside ([-0, 0]), [true, false]); + else + warning ("'signbit' function not available, skipping test."); + endif +4 tests, 4 passed, 0 known failure, 0 skipped Checking C++ files ... Done running the unit tests. -Summary: 258 tests, 254 passed, 4 known failures, 0 skipped +Summary: 258 tests, 253 passed, 5 known failures, 0 skipped dh_installdocs -O--buildsystem=octave dh_installchangelogs -O--buildsystem=octave dh_octave_changelogs -O--buildsystem=octave @@ -6006,12 +6044,14 @@ dpkg-buildpackage: info: binary-only upload (no source included) dpkg-genchanges: info: not including original source code in upload I: copying local configuration +I: user script /srv/workspace/pbuilder/32063/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/32063/tmp/hooks/B01_cleanup finished I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem I: cleaning the build env -I: removing directory /srv/workspace/pbuilder/8944 and its subdirectories -I: Current time: Sat Apr 6 02:48:55 -12 2024 -I: pbuilder-time-stamp: 1712414935 +I: removing directory /srv/workspace/pbuilder/32063 and its subdirectories +I: Current time: Sun Apr 7 05:01:26 +14 2024 +I: pbuilder-time-stamp: 1712415686