nissy-nx

A Rubik's cube optimal solver
git clone https://git.tronto.net/nissy-nx
Download | Log | Files | Refs | README | LICENSE

commit 84ac5f52efc9bc13fd1d3bd18991b1667aaf0413
parent 97c9dba402d6d4097cbdc4c44c00222c53122033
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date:   Sun, 13 Feb 2022 13:57:27 +0100

Small makefile changes, fixed todo list

Diffstat:
MMakefile | 16++++++----------
MTODO.md | 5++---
Mdoc/nissy.html | 18++++++++----------
Mdoc/nissy.pdf | 0
Dnissy | 0
Dnissy.exe | 0
6 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/Makefile b/Makefile @@ -14,26 +14,21 @@ DBGFLAGS = -std=c99 -pthread -pedantic -Wall -Wextra \ CC = cc -all: options nissy - -options: - @echo nissy build options: - @echo "CFLAGS = ${CFLAGS}" - @echo "CC = ${CC}" +all: nissy nissy: ${CC} ${CFLAGS} -o nissy src/*.c -win: +nissy.exe: x86_64-w64-mingw32-gcc ${CFLAGS} -static -o nissy.exe src/*.c debug: ${CC} ${DBGFLAGS} -o nissy src/*.c clean: - rm -rf nissy nissy-*.tar.gz + rm -rf nissy nissy*.exe nissy*.tar.gz -dist: clean +dist: clean nissy.exe mkdir -p nissy-${VERSION} cp -R LICENSE Makefile INSTALL doc src nissy-${VERSION} groff -Tpdf -mandoc doc/nissy.1 > doc/nissy.pdf @@ -43,6 +38,7 @@ dist: clean tar -cf nissy-${VERSION}.tar nissy-${VERSION} gzip nissy-${VERSION}.tar rm -rf nissy-${VERSION} + mv nissy.exe nissy-${VERSION}.exe install: nissy mkdir -p ${DESTDIR}${PREFIX}/bin @@ -57,5 +53,5 @@ uninstall: rm -rf ${DESTDIR}${PREFIX}/bin/nissy ${DESTDIR}${MANPREFIX}/man1/nissy.1 for s in ${SCRIPTS}; do rm -rf ${DESTDIR}${PREFIX}/bin/$$s; done -.PHONY: all options win debug clean dist install uninstall +.PHONY: all debug clean dist install uninstall diff --git a/TODO.md b/TODO.md @@ -4,9 +4,6 @@ This is a list of things that I would like to add or change at some point. It's more of a personal reminder than anything else. ## For version 2.1 -### Bugs -* when reading scramble, unmatched ( does not produce any error, unmatched ) -produces TWO errors but it goes on anyway ### Scrambles * Better two-phase solver, make sure to not have cancelling moves (possibly use cleanup function) @@ -23,6 +20,8 @@ produces TWO errors but it goes on anyway ### More * Anything quick and easy from the sections below * fix LICENSE file +* Download page at nissy.tronto.net, upload every dist version there + (and then always run make clean before git push) ## Commands diff --git a/doc/nissy.html b/doc/nissy.html @@ -1,5 +1,5 @@ <!-- Creator : groff version 1.22.4 --> -<!-- CreationDate: Wed Dec 29 17:47:39 2021 --> +<!-- CreationDate: Sun Feb 13 13:56:11 2022 --> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> @@ -29,10 +29,9 @@ Rubik&rsquo;s cube solver and FMC assistant</p> <p style="margin-top: 1em"><b>SYNOPSIS</b></p> -<p style="margin-left:6%;">[<b>&minus;b</b>]</p> - -<p style="margin-left:14%;"><b>nissy</b> <i>command</i> -[options...]</p> +<p style="margin-left:14%;"><b>nissy</b> [<b>&minus;b</b>] +<b><br> +nissy</b> <i>command</i> [options...]</p> <p style="margin-top: 1em"><b>DESCRIPTION</b></p> @@ -181,11 +180,10 @@ solutions that require the minimum number of moves.</p> <p style="margin-left:27%; margin-top: 1em">Only find solutions that require at most <i>N</i> moves more than the -optimal solution. If <i>N</i> is 0, this is equivalent -to</p> +optimal solution. If <i>N</i> is 0, this is equivalent to +<b>&minus;o</b></p> -<p style="margin-top: 1em"><b>&minus;o <br> -&minus;p</b></p> +<p style="margin-top: 1em"><b>&minus;p</b></p> <p style="margin-left:27%; margin-top: 1em">Plain style: do not print the number of moves.</p> @@ -310,7 +308,7 @@ D' F R' D B L2 B R2 L U L U2 B D' U R U F2 (18)</p> <b>https://github.com/sebastianotronto/nissy</b></p> <p style="margin-left:6%; margin-top: 1em">BSD -December&nbsp;29, 2021 BSD</p> +February&nbsp;13, 2022 BSD</p> <hr> </body> </html> diff --git a/doc/nissy.pdf b/doc/nissy.pdf Binary files differ. diff --git a/nissy b/nissy Binary files differ. diff --git a/nissy.exe b/nissy.exe Binary files differ.