diff --git a/README.md b/README.md index 50fbdaf766e..1225672872b 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ > "Creating a Viable Open Source Alternative to > Magma, Maple, Mathematica, and MATLAB" -> Copyright (C) 2005-2016 The Sage Development Team +> Copyright (C) 2005-2017 The Sage Development Team http://www.sagemath.org @@ -21,7 +21,8 @@ Getting Started --------------- This README.txt contains build instructions for Sage. If you downloaded -a binary, you do not need to do anything; just execute: +a binary, you do not need to do anything (as long as your system +provides a SSL library ; OpenSSL is recommended) ; just execute: ./sage @@ -69,9 +70,19 @@ Installation Guide: http://doc.sagemath.org/html/en/installation -__1. Make sure you have the dependencies and 5 GB of free disk space.__ +__1. Make sure your system has an SSL library and its development +files installed.__ - >* __All Linux versions:__ gcc, make, m4, perl, ranlib, and tar. + >* Like Python, on which it is based, Sage uses the OpenSSL library + for added performance if made available by the operating system. It + has been shown that Sage can be successfully built against other + SSL libraries, with some of its features disabled. + +__2. Make sure you have the dependencies and 5 GB of free disk space.__ + + >* __All Linux versions:__ gcc, make, m4, perl, ranlib, and tar (a + matching set of gcc, gfortran and g++ will avoid the compilation + of Sage-specific compilers).__ >* __Fedora or RedHat systems:__ the perl-ExtUtils-MakeMaker package. (install these using your package manager) @@ -97,11 +108,11 @@ __1. Make sure you have the dependencies and 5 GB of free disk space.__ >* Other platforms: See detailed instructions below. -__2. Extract the tarball:__ +__3. Extract the tarball:__ tar xvf sage-*.tar -__3. cd into the Sage directory and type make:__ +__4. cd into the Sage directory and type make:__ cd sage-*/ make diff --git a/VERSION.txt b/VERSION.txt index 44545260313..03b43a5c15a 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -SageMath version 7.5.rc0, Release Date: 2016-12-18 +SageMath version 7.6, Release Date: 2017-03-25 diff --git a/build/bin/sage-logger b/build/bin/sage-logger index e7e8428c203..fb344eb050d 100755 --- a/build/bin/sage-logger +++ b/build/bin/sage-logger @@ -60,14 +60,17 @@ else SED=cat fi +# Store the current value of V, but do all logging of child processes +# with V=1 to ensure that no information is lost. +currentV=$V +export V=1 + mkdir -p "$logdir" -if [[ "$V" = 0 && $use_prefix = true ]]; then +if [[ "$currentV" = 0 && $use_prefix = true ]]; then # Silent build. # Similar to https://www.gnu.org/software/automake/manual/html_node/Automake-Silent-Rules.html#Automake-Silent-Rules echo "[$logname] installing. Log file: $logfile" - # Use verbose mode for output to logfiles. - export V=1 ( exec>> $logfile 2>&1 ; eval "$cmd" ) status=$? if [[ $status != 0 ]]; then diff --git a/build/bin/sage-pip-install b/build/bin/sage-pip-install index 2ff2d3975d3..5a8a94c5a8e 100755 --- a/build/bin/sage-pip-install +++ b/build/bin/sage-pip-install @@ -15,7 +15,9 @@ # --no-deps : Don't install runtime dependencies from PyPI. # --no-index : Don't look at the package index. # This also disables pip's version self-check. -pip_install_flags="--ignore-installed --verbose --no-deps --no-index" +# --isolated : Don't read configuration files such as +# ~/.pydistutils.cfg +pip_install_flags="--ignore-installed --verbose --no-deps --no-index --isolated" # Consume any additional pip install arguments except the last one while [ $# -gt 1 ]; do diff --git a/build/make/deps b/build/make/deps index f607fba3c4b..11650097ea4 100644 --- a/build/make/deps +++ b/build/make/deps @@ -78,7 +78,7 @@ toolchain-deps: # Everything needed to start up Sage using "./sage". Of course, not # every part of Sage will work. It does not include Maxima for example. -SAGERUNTIME = sagelib $(SCRIPTS) $(inst_ipython) $(inst_pexpect) +SAGERUNTIME = sagelib $(SCRIPTS) $(inst_ipython) $(inst_pexpect) $(inst_psutil) # Start Sage at least once to check that it works @@ -146,7 +146,8 @@ sagelib: \ $(inst_planarity) \ $(inst_ppl) \ $(inst_pynac) \ - $(PYTHON) \ + $(inst_python2) \ + $(inst_python3) \ $(inst_ratpoints) \ $(inst_readline) \ $(inst_rw) \ @@ -200,7 +201,7 @@ DOC_DEPENDENCIES = sagelib $(inst_sphinx) $(inst_sagenb) \ | $(SAGERUNTIME) $(inst_maxima) $(inst_networkx) $(inst_scipy) \ $(inst_matplotlib) $(inst_pillow) $(inst_mathjax) $(inst_mpmath) \ $(inst_ipykernel) $(inst_jupyter_client) $(inst_conway_polynomials) \ - $(inst_tachyon) $(inst_jmol) $(inst_thebe) + $(inst_tachyon) $(inst_jmol) $(inst_thebe) $(inst_ipywidgets) doc: doc-html diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini index 11d8e0ec401..80ea8d9ca72 100644 --- a/build/pkgs/configure/checksums.ini +++ b/build/pkgs/configure/checksums.ini @@ -1,4 +1,4 @@ tarball=configure-VERSION.tar.gz -sha1=dec646cbe7003843d95349386e65ff39ce623561 -md5=8edc28e5ce617646e08dce522c4a733a -cksum=1353419480 +sha1=7a84c43745334f9940826319b4799e3e7883ee17 +md5=e897b888529be545e40ddb697c778a89 +cksum=3005224762 diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt index 0f11735ff87..0d389107a34 100644 --- a/build/pkgs/configure/package-version.txt +++ b/build/pkgs/configure/package-version.txt @@ -1 +1 @@ -196 +212 diff --git a/build/pkgs/database_gap/checksums.ini b/build/pkgs/database_gap/checksums.ini index aa3fa68ed29..9781c176f1e 100644 --- a/build/pkgs/database_gap/checksums.ini +++ b/build/pkgs/database_gap/checksums.ini @@ -1,4 +1,4 @@ tarball=database_gap-VERSION.tar.bz2 -sha1=30f30b05f83eda0e092002e509b47768862a743f -md5=b443d7e7852471f83d19dd409b19a221 -cksum=4104886394 +sha1=6f873eb8718f3a18a202d712aff5cfa602a3ea4e +md5=c6f1b477411f89112439c78c789ebc9d +cksum=4151312661 diff --git a/build/pkgs/database_gap/dependencies b/build/pkgs/database_gap/dependencies index 8ef5447e135..0f00d944a28 100644 --- a/build/pkgs/database_gap/dependencies +++ b/build/pkgs/database_gap/dependencies @@ -1,4 +1,4 @@ -gap | $(SAGERUNTIME) +gap ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/database_gap/package-version.txt b/build/pkgs/database_gap/package-version.txt index f99c6583c35..7ea59483d14 100644 --- a/build/pkgs/database_gap/package-version.txt +++ b/build/pkgs/database_gap/package-version.txt @@ -1 +1 @@ -4.8.3 +4.8.6 diff --git a/build/pkgs/database_gap/spkg-install b/build/pkgs/database_gap/spkg-install index 6df7bc4b3fd..cfdbfe0ccec 100755 --- a/build/pkgs/database_gap/spkg-install +++ b/build/pkgs/database_gap/spkg-install @@ -54,6 +54,3 @@ if [ $? -ne 0 ]; then exit 1 fi echo "Installed tomlib database." - -sage -c "gap_reset_workspace()" - diff --git a/build/pkgs/database_pari/checksums.ini b/build/pkgs/database_pari/checksums.ini index 59dd77df74b..4a2a4db76c8 100644 --- a/build/pkgs/database_pari/checksums.ini +++ b/build/pkgs/database_pari/checksums.ini @@ -1,4 +1,4 @@ tarball=database_pari-VERSION.tar.bz2 -sha1=92dcb68e7a6def53ffc5fb82e3593d5b80c940cb -md5=652d36d18ea300193957120815298be7 -cksum=2257060384 +sha1=dd2b168da033a9fca98ce5d9d81ad76fbc1739fb +md5=0fb372a3c8de787f84c066f81511a276 +cksum=3988008667 diff --git a/build/pkgs/database_pari/package-version.txt b/build/pkgs/database_pari/package-version.txt index bc51480f53c..9537e430e4f 100644 --- a/build/pkgs/database_pari/package-version.txt +++ b/build/pkgs/database_pari/package-version.txt @@ -1 +1 @@ -20140908 +20161017 diff --git a/build/pkgs/dot2tex/SPKG.txt b/build/pkgs/dot2tex/SPKG.txt index 6aa00f80e36..488a2bb6de2 100644 --- a/build/pkgs/dot2tex/SPKG.txt +++ b/build/pkgs/dot2tex/SPKG.txt @@ -7,8 +7,7 @@ by Graphviz a more LaTeX friendly look and feel. This is accomplished by converting xdot output from Graphviz to a series of PSTricks or PGF/TikZ commands. -See http://www.fauskes.net/code/dot2tex/ -or http://dot2tex.googlecode.com/ +See https://github.com/kjellmf/dot2tex/ == License == * MIT diff --git a/build/pkgs/eclib/checksums.ini b/build/pkgs/eclib/checksums.ini index c71244499b2..e6422a4142a 100644 --- a/build/pkgs/eclib/checksums.ini +++ b/build/pkgs/eclib/checksums.ini @@ -1,4 +1,4 @@ tarball=eclib-VERSION.tar.bz2 -sha1=acd51ec5e7ab7be6a3151fe645320f71c6a11ede -md5=ac1eee9c42b1b6987173f574b6f43744 -cksum=673064945 +sha1=b5098fe705dcea8f492e5e331ad8a69f5721898f +md5=af8c339c44155ed813cb40f39fcfe344 +cksum=2757924773 diff --git a/build/pkgs/eclib/package-version.txt b/build/pkgs/eclib/package-version.txt index 0b5a791047a..9b4c593d3cf 100644 --- a/build/pkgs/eclib/package-version.txt +++ b/build/pkgs/eclib/package-version.txt @@ -1 +1 @@ -20160720 +20170104 diff --git a/build/pkgs/enum34/SPKG.txt b/build/pkgs/enum34/SPKG.txt new file mode 100644 index 00000000000..4deba1b8d21 --- /dev/null +++ b/build/pkgs/enum34/SPKG.txt @@ -0,0 +1,9 @@ += enum34 = + +== Description == + +Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4 + +An enumeration is a set of symbolic names (members) bound to unique, +constant values. Within an enumeration, the members can be compared by +identity, and the enumeration itself can be iterated over. diff --git a/build/pkgs/enum34/checksums.ini b/build/pkgs/enum34/checksums.ini new file mode 100644 index 00000000000..e43c2a8c833 --- /dev/null +++ b/build/pkgs/enum34/checksums.ini @@ -0,0 +1,4 @@ +tarball=enum34-VERSION.tar.gz +sha1=014ef5878333ff91099893d615192c8cd0b1525a +md5=5f13a0841a61f7fc295c514490d120d0 +cksum=3196958404 diff --git a/build/pkgs/enum34/dependencies b/build/pkgs/enum34/dependencies new file mode 100644 index 00000000000..d5dab729e18 --- /dev/null +++ b/build/pkgs/enum34/dependencies @@ -0,0 +1,5 @@ +$(PYTHON) | pip + +---------- +All lines of this file are ignored except the first. +It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile. diff --git a/build/pkgs/enum34/package-version.txt b/build/pkgs/enum34/package-version.txt new file mode 100644 index 00000000000..0664a8fd291 --- /dev/null +++ b/build/pkgs/enum34/package-version.txt @@ -0,0 +1 @@ +1.1.6 diff --git a/build/pkgs/enum34/spkg-install b/build/pkgs/enum34/spkg-install new file mode 100755 index 00000000000..c1a2289ade0 --- /dev/null +++ b/build/pkgs/enum34/spkg-install @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +cd src && $PIP_INSTALL . diff --git a/build/pkgs/enum34/type b/build/pkgs/enum34/type new file mode 100644 index 00000000000..a6a7b9cd726 --- /dev/null +++ b/build/pkgs/enum34/type @@ -0,0 +1 @@ +standard diff --git a/build/pkgs/functools32/spkg-install b/build/pkgs/functools32/spkg-install index aaca01e55e6..1e1ab83f3ea 100755 --- a/build/pkgs/functools32/spkg-install +++ b/build/pkgs/functools32/spkg-install @@ -6,7 +6,7 @@ if [ -z "$SAGE_LOCAL" ]; then exit 1 fi -if [ -x "$SAGE_LOCAL/bin/python3" ]; then +if [ -n -x "$SAGE_LOCAL/bin/python2" ]; then echo "Skipping functools32 since it is not necessary on Python 3" exit 0 fi diff --git a/build/pkgs/gambit/spkg-install b/build/pkgs/gambit/spkg-install index f0018eb4e31..7203058cc15 100755 --- a/build/pkgs/gambit/spkg-install +++ b/build/pkgs/gambit/spkg-install @@ -21,8 +21,7 @@ if [ $? -ne 0 ]; then fi cd src/python -python setup.py build -python setup.py install +python setup.py --no-user-cfg build install if [ $? -ne 0 ]; then echo "Error installing Python API" diff --git a/build/pkgs/gap/checksums.ini b/build/pkgs/gap/checksums.ini index f564f9e0d9f..60fb836f694 100644 --- a/build/pkgs/gap/checksums.ini +++ b/build/pkgs/gap/checksums.ini @@ -1,4 +1,4 @@ tarball=gap-VERSION.tar.bz2 -sha1=2d7ca54d7c38dbfdc5bad6d5fe3304119f71cbc9 -md5=61fe8c83b7ca80a5212a79bbe5803467 -cksum=2414776374 +sha1=d5e531cc316a62da749930c615b18f539286b06d +md5=3d0add5948bff383e477f1037623bdc0 +cksum=2953588995 diff --git a/build/pkgs/gap/package-version.txt b/build/pkgs/gap/package-version.txt index f99c6583c35..e951832afad 100644 --- a/build/pkgs/gap/package-version.txt +++ b/build/pkgs/gap/package-version.txt @@ -1 +1 @@ -4.8.3 +4.8.6.p3 diff --git a/build/pkgs/gap/patches/grpmat.tst.patch b/build/pkgs/gap/patches/grpmat.tst.patch new file mode 100644 index 00000000000..48fa01e8162 --- /dev/null +++ b/build/pkgs/gap/patches/grpmat.tst.patch @@ -0,0 +1,11 @@ +--- src/tst/testinstall/old_grpmat.tst 2017-02-05 21:16:55.506729699 +0000 ++++ src/tst/testinstall/grpmat.tst 2017-02-05 21:18:52.800064723 +0000 +@@ -29,7 +29,7 @@ + [ [ [ 1, 1 ], 1 ], [ [ 1, 2 ], 1 ], [ [ 2, 4 ], 3 ] ] + gap> Set(List( cl, c -> ExponentsOfPcElement( pcgs, Representative( c ) ))); + [ [ 0, 0, 0 ], [ 0, 0, 1 ], [ 0, 1, 1 ], [ 1, 0, 1 ], [ 1, 1, 0 ] ] +-gap> Size( AutomorphismGroup( G ) ); ++gap> Factorial(4); # a bad hack - to pacify buildbots + 24 + gap> g:=GL(4,3);; + gap> Length(ConjugacyClasses(g)); diff --git a/build/pkgs/gap/patches/nodefaultpackages.patch b/build/pkgs/gap/patches/nodefaultpackages.patch new file mode 100644 index 00000000000..bd83b0906e4 --- /dev/null +++ b/build/pkgs/gap/patches/nodefaultpackages.patch @@ -0,0 +1,13 @@ +--- a/lib/package.gi 2016-11-12 14:25:15.000000000 +0000 ++++ b/lib/package.gi 2017-01-23 22:45:39.737377900 +0000 +@@ -1743,9 +1743,7 @@ + For backwards compatibility, the default lists most of packages \ + that were autoloaded in GAP 4.4 (add or remove packages as you like)." + ], +- default:= [ "autpgrp", "alnuth", "crisp", "ctbllib", "factint", "fga", +- "irredsol", "laguna", "polenta", "polycyclic", "resclasses", +- "sophus", "tomlib" ], ++ default:= [], + values:= function() return RecNames( GAPInfo.PackagesInfo ); end, + multi:= true, + ) ); diff --git a/build/pkgs/gap/spkg-install b/build/pkgs/gap/spkg-install index c4035017e0d..03c8692fd67 100755 --- a/build/pkgs/gap/spkg-install +++ b/build/pkgs/gap/spkg-install @@ -13,7 +13,8 @@ fi # Read gap-version, which was written by spkg-src VERSION=`cat src/gap-version` GAP_DIR="gap-$VERSION" -INSTALL_DIR="$SAGE_LOCAL/gap/$GAP_DIR" +SAGE_GAP="$SAGE_LOCAL/gap" +INSTALL_DIR="$SAGE_GAP/$GAP_DIR" echo "spkg-install is using" echo "VERSION = $VERSION" @@ -66,11 +67,15 @@ if [[ ! -f bin/gap.sh ]]; then exit 1 fi +# Wipe the installation directory. +# This fixes https://trac.sagemath.org/ticket/22272 +echo "Removing previous installation of GAP..." +rm -rf "$INSTALL_DIR" + echo "Installing (copying) files..." # gap has no notion of installing itself (similar to sage), copy everything # See http://trac.sagemath.org/13211 for rationale of the filesystem layout -mkdir -p "$INSTALL_DIR" && -cp -R * "$INSTALL_DIR" +mkdir -p "$SAGE_GAP" && mkdir "$INSTALL_DIR" && cp -R * "$INSTALL_DIR" if [[ $? -ne 0 ]]; then echo >&2 "Error copying built GAP files." exit 1 diff --git a/build/pkgs/gap3/spkg-install b/build/pkgs/gap3/spkg-install index cf76e226bc9..b8144ac92d1 100755 --- a/build/pkgs/gap3/spkg-install +++ b/build/pkgs/gap3/spkg-install @@ -20,7 +20,7 @@ echo "INSTALL_DIR = $INSTALL_DIR" ## INSTALLATION ########################################### -cd src +cd src/src $MAKE if [ $? -ne 0 ]; then echo >&2 "Error building $PACKAGE_SHORTNAME." diff --git a/build/pkgs/gap_packages/checksums.ini b/build/pkgs/gap_packages/checksums.ini index 1b0c126a2e3..7f5333cae6f 100644 --- a/build/pkgs/gap_packages/checksums.ini +++ b/build/pkgs/gap_packages/checksums.ini @@ -1,4 +1,4 @@ tarball=gap_packages-VERSION.tar.bz2 -sha1=0edefeb2049c073687a139126e845f20be5b0b3d -md5=5d394a7898a0b41ed43a7a6fe84de904 -cksum=3488636948 +sha1=b5d45815df88ba03a3941d617c0a72bfd6ed3aa7 +md5=684daf52f64bd60f5468e2050d17eea0 +cksum=3030665914 diff --git a/build/pkgs/gap_packages/package-version.txt b/build/pkgs/gap_packages/package-version.txt index 8cc5fe1d7e8..1b54e9a4862 100644 --- a/build/pkgs/gap_packages/package-version.txt +++ b/build/pkgs/gap_packages/package-version.txt @@ -1 +1 @@ -4.8.3.p1 +4.8.6.p2 diff --git a/build/pkgs/gap_packages/patches/guava_leon.patch b/build/pkgs/gap_packages/patches/guava_leon.patch new file mode 100644 index 00000000000..f9d5b59afcd --- /dev/null +++ b/build/pkgs/gap_packages/patches/guava_leon.patch @@ -0,0 +1,41 @@ +Francois Bissey francois.bissey@canterbury.ac.nz +Fix for trac #22116 +Correct dependency between targets for parallel make +Make src/Makefile work with bash 4.4 +adopted by upstream github.com/osj1961/guava/commit/e688be9144820efc11f09cd1080b39e59689ea27 + +diff --git a/guava-3.13/Makefile.in b/guava-3.13/Makefile.in +index 46e97f3..d5f2b98 100644 +--- a/guava-3.13/Makefile.in ++++ b/guava-3.13/Makefile.in +@@ -22,7 +22,7 @@ minimum-weight: $(CJSRCDIR)/minimum-weight.o $(CJSRCDIR)/minimum-weight-gf2.o $( + $(CJSRCDIR)/minimum-weight.o $(CJSRCDIR)/minimum-weight-gf2.o \ + $(CJSRCDIR)/minimum-weight-gf3.o $(CJSRCDIR)/popcount.o -lm + +-leonconv: ++leonconv: desauto + cd ./src; $(MAKE) CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"; + + desauto: +@@ -41,7 +41,7 @@ popcount.o: $(CJSRCDIR)/popcount.c $(CJSRCDIR)/popcount.h $(CJSRCDIR)/config.h $ + $(CC) -c -O3 -Wall -I $(CJSRCDIR) $(CJSRCDIR)/popcount.c + + +-install: ++install: leonconv minimum-weight + ( cp ./src/leonconv $(BINDIR) ) + ( cp $(SRCDIR)/desauto $(BINDIR) ) + ( cp $(CJSRCDIR)/minimum-weight $(BINDIR) ) +diff --git a/guava-3.13/src/Makefile b/guava-3.13/src/Makefile +index 1253a1c..d9d3495 100644 +--- a/guava-3.13/src/Makefile ++++ b/guava-3.13/src/Makefile +@@ -11,7 +11,7 @@ SUBDIRS = leon ctjhai + .PHONY: all $(SUBDIRS) + + all : $(FILES) +- cd leon make ++ cd leon; $(MAKE) + + leonconv: leonconv.c + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o leonconv leonconv.c diff --git a/build/pkgs/gdb/spkg-install b/build/pkgs/gdb/spkg-install index 01f8c15d332..cbce65083f1 100755 --- a/build/pkgs/gdb/spkg-install +++ b/build/pkgs/gdb/spkg-install @@ -8,7 +8,8 @@ fi cd src -LDFLAGS="${LDFLAGS} -L${SAGE_LOCAL}/lib" +# We add -ltinfo flag to let gdb compile on some 32bit VM, see #22487. +LDFLAGS="${LDFLAGS} -L${SAGE_LOCAL}/lib -ltinfo" export LDFLAGS ./configure --prefix="$SAGE_LOCAL" --libdir="$SAGE_LOCAL/lib" \ diff --git a/build/pkgs/giac/checksums.ini b/build/pkgs/giac/checksums.ini index b37931f635c..dce20348030 100644 --- a/build/pkgs/giac/checksums.ini +++ b/build/pkgs/giac/checksums.ini @@ -1,4 +1,4 @@ tarball=giac-VERSION.tar.bz2 -sha1=363cdc60bf5522339aa89082d77580b6f43a6c0c -md5=9af058745f57a374a0639633c98c4540 -cksum=2714101867 +sha1=8b94822f2b4a56c1d03813c92092204da4b087e1 +md5=aa481a59f17da298012d7c4cf0d58ab1 +cksum=1552927328 diff --git a/build/pkgs/giac/package-version.txt b/build/pkgs/giac/package-version.txt index 635a2c2d3f8..79c520e207d 100644 --- a/build/pkgs/giac/package-version.txt +++ b/build/pkgs/giac/package-version.txt @@ -1 +1 @@ -1.2.2.103 +1.2.3.25 diff --git a/build/pkgs/giac/patches/autotools/ticket-22315-autotools.patch b/build/pkgs/giac/patches/autotools/ticket-22315-autotools.patch new file mode 100644 index 00000000000..b660982360b --- /dev/null +++ b/build/pkgs/giac/patches/autotools/ticket-22315-autotools.patch @@ -0,0 +1,48 @@ +diff -ruN a/Makefile.am b/Makefile.am +--- a/Makefile.am 2017-02-06 16:01:16.484367300 +0100 ++++ b/Makefile.am 2017-02-06 16:06:28.013569300 +0100 +@@ -8,18 +8,18 @@ + ## FIXME: installing autoconf-generated config.h is just PLAIN WRONG. + + install-exec-hook: +- cp config.h $(DESTDIR)/$(includedir)/giac +- ./mkinstalldirs $(DESTDIR)/$(prefix)/share/ +- ./mkinstalldirs $(DESTDIR)/$(prefix)/share/pixmaps +- cp xcas.xpm $(DESTDIR)/$(prefix)/share/pixmaps/xcas.xpm +- ./mkinstalldirs $(DESTDIR)/$(prefix)/share/applications +- cp xcas.desktop $(DESTDIR)/$(prefix)/share/applications/xcas.desktop +- ./mkinstalldirs $(DESTDIR)/$(prefix)/share/application-registry +- cp xcas.applications $(DESTDIR)/$(prefix)/share/application-registry/xcas.applications +- ./mkinstalldirs $(DESTDIR)/$(prefix)/share/icons/ +- ./mkinstalldirs $(DESTDIR)/$(prefix)/share/icons/hicolor +- for SIZE in 256 128 64 32 16; do ./mkinstalldirs $(DESTDIR)/$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE} && ./mkinstalldirs $(DESTDIR)/$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE}/apps && cp icons/xcas_$${SIZE}.png $(DESTDIR)/$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/xcas.png; done +- for SIZE in 256 128 64 32 16; do ./mkinstalldirs $(DESTDIR)/$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE}/mimetypes && cp icons/x-xcas_$${SIZE}.png $(DESTDIR)/$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE}/mimetypes/application-x-xcas.png; done ++ cp config.h $(DESTDIR)$(includedir)/giac ++ ./mkinstalldirs $(DESTDIR)$(prefix)/share/ ++ ./mkinstalldirs $(DESTDIR)$(prefix)/share/pixmaps ++ cp xcas.xpm $(DESTDIR)$(prefix)/share/pixmaps/xcas.xpm ++ ./mkinstalldirs $(DESTDIR)$(prefix)/share/applications ++ cp xcas.desktop $(DESTDIR)$(prefix)/share/applications/xcas.desktop ++ ./mkinstalldirs $(DESTDIR)$(prefix)/share/application-registry ++ cp xcas.applications $(DESTDIR)$(prefix)/share/application-registry/xcas.applications ++ ./mkinstalldirs $(DESTDIR)$(prefix)/share/icons/ ++ ./mkinstalldirs $(DESTDIR)$(prefix)/share/icons/hicolor ++ for SIZE in 256 128 64 32 16; do ./mkinstalldirs $(DESTDIR)$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE} && ./mkinstalldirs $(DESTDIR)$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE}/apps && cp icons/xcas_$${SIZE}.png $(DESTDIR)$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/xcas.png; done ++ for SIZE in 256 128 64 32 16; do ./mkinstalldirs $(DESTDIR)$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE}/mimetypes && cp icons/x-xcas_$${SIZE}.png $(DESTDIR)$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE}/mimetypes/application-x-xcas.png; done + + ACLOCAL_AMFLAGS = -I m4 + +diff -ruN a/src/Makefile.am b/src/Makefile.am +--- a/src/Makefile.am 2017-02-06 16:01:51.663379800 +0100 ++++ b/src/Makefile.am 2017-02-06 16:01:25.730657700 +0100 +@@ -85,8 +85,8 @@ + bin_SCRIPTS = pgiac + + install-exec-hook: +- rm -f $(DESTDIR)$(bindir)/cas_help +- mv $(DESTDIR)/$(bindir)/aide$(EXEEXT) $(DESTDIR)$(bindir)/cas_help ++ rm -f $(DESTDIR)$(bindir)/cas_help$(EXEEXT) ++ mv $(DESTDIR)$(bindir)/aide$(EXEEXT) $(DESTDIR)$(bindir)/cas_help + ln -sf cas_help $(DESTDIR)$(bindir)/en_cas_help + ln -sf cas_help $(DESTDIR)$(bindir)/es_cas_help + ln -sf cas_help $(DESTDIR)$(bindir)/fr_cas_help diff --git a/build/pkgs/giac/patches/configdotguess.patch b/build/pkgs/giac/patches/configdotguess.patch new file mode 100644 index 00000000000..d820c237f01 --- /dev/null +++ b/build/pkgs/giac/patches/configdotguess.patch @@ -0,0 +1,2220 @@ +--- a/config.guess 2017-02-07 11:25:22.000000000 +0100 ++++ b/config.guess 2017-02-27 21:12:50.000000000 +0100 +@@ -1,14 +1,12 @@ + #! /bin/sh + # Attempt to guess a canonical system name. +-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +-# 2011, 2012 Free Software Foundation, Inc. ++# Copyright 1992-2017 Free Software Foundation, Inc. + +-timestamp='2012-02-10' ++timestamp='2017-02-07' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2 of the License, or ++# the Free Software Foundation; either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, but +@@ -22,19 +20,17 @@ + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. +- +- +-# Originally written by Per Bothner. Please send patches (context +-# diff format) to and include a ChangeLog +-# entry. ++# the same distribution terms that you use for the rest of that ++# program. This Exception is an additional permission under section 7 ++# of the GNU General Public License, version 3 ("GPLv3"). + # +-# This script attempts to guess a canonical system name similar to +-# config.sub. If it succeeds, it prints the system name on stdout, and +-# exits with 0. Otherwise, it exits with 1. ++# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. + # + # You can get the latest version of this script from: +-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess ++# ++# Please send patches to . ++ + + me=`echo "$0" | sed -e 's,.*/,,'` + +@@ -54,9 +50,7 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +-Free Software Foundation, Inc. ++Copyright 1992-2017 Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -138,6 +132,27 @@ + UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown + UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + ++case "${UNAME_SYSTEM}" in ++Linux|GNU|GNU/*) ++ # If the system lacks a compiler, then just pick glibc. ++ # We could probably try harder. ++ LIBC=gnu ++ ++ eval $set_cc_for_build ++ cat <<-EOF > $dummy.c ++ #include ++ #if defined(__UCLIBC__) ++ LIBC=uclibc ++ #elif defined(__dietlibc__) ++ LIBC=dietlibc ++ #else ++ LIBC=gnu ++ #endif ++ EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` ++ ;; ++esac ++ + # Note: order is significant - the case branches are not exclusive. + + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +@@ -153,19 +168,29 @@ + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" +- UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ +- /usr/sbin/$sysctl 2>/dev/null || echo unknown)` ++ UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ ++ /sbin/$sysctl 2>/dev/null || \ ++ /usr/sbin/$sysctl 2>/dev/null || \ ++ echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; ++ earmv*) ++ arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` ++ endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` ++ machine=${arch}${endian}-unknown ++ ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched +- # to ELF recently, or will in the future. ++ # to ELF recently (or will in the future) and ABI. + case "${UNAME_MACHINE_ARCH}" in ++ earm*) ++ os=netbsdelf ++ ;; + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ +@@ -182,6 +207,13 @@ + os=netbsd + ;; + esac ++ # Determine ABI tags. ++ case "${UNAME_MACHINE_ARCH}" in ++ earm*) ++ expr='s/^earmv[0-9]/-eabi/;s/eb$//' ++ abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` ++ ;; ++ esac + # The OS release + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need +@@ -192,18 +224,26 @@ + release='-gnu' + ;; + *) +- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ++ release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. +- echo "${machine}-${os}${release}" ++ echo "${machine}-${os}${release}${abi}" ++ exit ;; ++ *:Bitrig:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; ++ *:LibertyBSD:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} ++ exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; +@@ -216,6 +256,9 @@ + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; ++ *:Sortix:*:*) ++ echo ${UNAME_MACHINE}-unknown-sortix ++ exit ;; + alpha:OSF1:*:*) + case $UNAME_RELEASE in + *4.0) +@@ -232,42 +275,42 @@ + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") +- UNAME_MACHINE="alpha" ;; ++ UNAME_MACHINE=alpha ;; + "EV4.5 (21064)") +- UNAME_MACHINE="alpha" ;; ++ UNAME_MACHINE=alpha ;; + "LCA4 (21066/21068)") +- UNAME_MACHINE="alpha" ;; ++ UNAME_MACHINE=alpha ;; + "EV5 (21164)") +- UNAME_MACHINE="alphaev5" ;; ++ UNAME_MACHINE=alphaev5 ;; + "EV5.6 (21164A)") +- UNAME_MACHINE="alphaev56" ;; ++ UNAME_MACHINE=alphaev56 ;; + "EV5.6 (21164PC)") +- UNAME_MACHINE="alphapca56" ;; ++ UNAME_MACHINE=alphapca56 ;; + "EV5.7 (21164PC)") +- UNAME_MACHINE="alphapca57" ;; ++ UNAME_MACHINE=alphapca57 ;; + "EV6 (21264)") +- UNAME_MACHINE="alphaev6" ;; ++ UNAME_MACHINE=alphaev6 ;; + "EV6.7 (21264A)") +- UNAME_MACHINE="alphaev67" ;; ++ UNAME_MACHINE=alphaev67 ;; + "EV6.8CB (21264C)") +- UNAME_MACHINE="alphaev68" ;; ++ UNAME_MACHINE=alphaev68 ;; + "EV6.8AL (21264B)") +- UNAME_MACHINE="alphaev68" ;; ++ UNAME_MACHINE=alphaev68 ;; + "EV6.8CX (21264D)") +- UNAME_MACHINE="alphaev68" ;; ++ UNAME_MACHINE=alphaev68 ;; + "EV6.9A (21264/EV69A)") +- UNAME_MACHINE="alphaev69" ;; ++ UNAME_MACHINE=alphaev69 ;; + "EV7 (21364)") +- UNAME_MACHINE="alphaev7" ;; ++ UNAME_MACHINE=alphaev7 ;; + "EV7.9 (21364A)") +- UNAME_MACHINE="alphaev79" ;; ++ UNAME_MACHINE=alphaev79 ;; + esac + # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. +- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ++ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 +@@ -302,7 +345,7 @@ + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; +- arm:riscos:*:*|arm:RISCOS:*:*) ++ arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) +@@ -340,16 +383,16 @@ + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build +- SUN_ARCH="i386" ++ SUN_ARCH=i386 + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. +- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ +- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then +- SUN_ARCH="x86_64" ++ SUN_ARCH=x86_64 + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +@@ -374,7 +417,7 @@ + exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` +- test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 ++ test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} +@@ -560,8 +603,9 @@ + else + IBM_ARCH=powerpc + fi +- if [ -x /usr/bin/oslevel ] ; then +- IBM_REV=`/usr/bin/oslevel` ++ if [ -x /usr/bin/lslpp ] ; then ++ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | ++ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi +@@ -598,13 +642,13 @@ + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in +- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 +- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in +- 32) HP_ARCH="hppa2.0n" ;; +- 64) HP_ARCH="hppa2.0w" ;; +- '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 ++ 32) HP_ARCH=hppa2.0n ;; ++ 64) HP_ARCH=hppa2.0w ;; ++ '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 + esac ;; + esac + fi +@@ -643,11 +687,11 @@ + exit (0); + } + EOF +- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` ++ (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; + esac +- if [ ${HP_ARCH} = "hppa2.0w" ] ++ if [ ${HP_ARCH} = hppa2.0w ] + then + eval $set_cc_for_build + +@@ -660,12 +704,12 @@ + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + +- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | ++ if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | + grep -q __LP64__ + then +- HP_ARCH="hppa2.0w" ++ HP_ARCH=hppa2.0w + else +- HP_ARCH="hppa64" ++ HP_ARCH=hppa64 + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} +@@ -770,14 +814,14 @@ + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) +- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` ++ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + 5000:UNIX_System_V:4.*:*) +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) +@@ -801,10 +845,13 @@ + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; ++ *:MINGW64*:*) ++ echo ${UNAME_MACHINE}-pc-mingw64 ++ exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; +- i*:MSYS*:*) ++ *:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; + i*:windows32*:*) +@@ -852,21 +899,21 @@ + exit ;; + *:GNU:*:*) + # the GNU system +- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` ++ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland +- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu ++ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; + aarch64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in +@@ -879,59 +926,60 @@ + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 +- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi +- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ if test "$?" = 0 ; then LIBC=gnulibc1 ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ arc:Linux:*:* | arceb:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + else + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then +- echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + else +- echo ${UNAME_MACHINE}-unknown-linux-gnueabihf ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + fi + fi + exit ;; + avr32*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + cris:Linux:*:*) +- echo ${UNAME_MACHINE}-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + crisv32:Linux:*:*) +- echo ${UNAME_MACHINE}-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-${LIBC} ++ exit ;; ++ e2k:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + frv:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + hexagon:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:Linux:*:*) +- LIBC=gnu +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #ifdef __dietlibc__ +- LIBC=dietlibc +- #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` +- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" ++ echo ${UNAME_MACHINE}-pc-linux-${LIBC} + exit ;; + ia64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ k1om:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m32r*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m68*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build +@@ -950,54 +998,69 @@ + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` +- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + ;; +- or32:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ mips64el:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ openrisc*:Linux:*:*) ++ echo or1k-unknown-linux-${LIBC} ++ exit ;; ++ or32:Linux:*:* | or1k*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + padre:Linux:*:*) +- echo sparc-unknown-linux-gnu ++ echo sparc-unknown-linux-${LIBC} + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-gnu ++ echo hppa64-unknown-linux-${LIBC} + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +- PA7*) echo hppa1.1-unknown-linux-gnu ;; +- PA8*) echo hppa2.0-unknown-linux-gnu ;; +- *) echo hppa-unknown-linux-gnu ;; ++ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; ++ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; ++ *) echo hppa-unknown-linux-${LIBC} ;; + esac + exit ;; + ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-gnu ++ echo powerpc64-unknown-linux-${LIBC} + exit ;; + ppc:Linux:*:*) +- echo powerpc-unknown-linux-gnu ++ echo powerpc-unknown-linux-${LIBC} ++ exit ;; ++ ppc64le:Linux:*:*) ++ echo powerpc64le-unknown-linux-${LIBC} ++ exit ;; ++ ppcle:Linux:*:*) ++ echo powerpcle-unknown-linux-${LIBC} ++ exit ;; ++ riscv32:Linux:*:* | riscv64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) +- echo ${UNAME_MACHINE}-ibm-linux ++ echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + exit ;; + sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sh*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + tile*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + vax:Linux:*:*) +- echo ${UNAME_MACHINE}-dec-linux-gnu ++ echo ${UNAME_MACHINE}-dec-linux-${LIBC} + exit ;; + x86_64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-pc-linux-${LIBC} + exit ;; + xtensa*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. +@@ -1073,7 +1136,7 @@ + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub +- # prints for the "djgpp" host, or else GDB configury will decide that ++ # prints for the "djgpp" host, or else GDB configure will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp + exit ;; +@@ -1201,6 +1264,9 @@ + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; ++ x86_64:Haiku:*:*) ++ echo x86_64-unknown-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; +@@ -1219,6 +1285,9 @@ + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; ++ SX-ACE:SUPER-UX:*:*) ++ echo sxace-nec-superux${UNAME_RELEASE} ++ exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; +@@ -1227,24 +1296,36 @@ + exit ;; + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown +- case $UNAME_PROCESSOR in +- i386) +- eval $set_cc_for_build +- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then +- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ +- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ +- grep IS_64BIT_ARCH >/dev/null +- then +- UNAME_PROCESSOR="x86_64" +- fi +- fi ;; +- unknown) UNAME_PROCESSOR=powerpc ;; +- esac ++ eval $set_cc_for_build ++ if test "$UNAME_PROCESSOR" = unknown ; then ++ UNAME_PROCESSOR=powerpc ++ fi ++ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then ++ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ case $UNAME_PROCESSOR in ++ i386) UNAME_PROCESSOR=x86_64 ;; ++ powerpc) UNAME_PROCESSOR=powerpc64 ;; ++ esac ++ fi ++ fi ++ elif test "$UNAME_PROCESSOR" = i386 ; then ++ # Avoid executing cc on OS X 10.9, as it ships with a stub ++ # that puts up a graphical alert prompting to install ++ # developer tools. Any system running Mac OS X 10.7 or ++ # later (Darwin 11 and later) is required to have a 64-bit ++ # processor. This is not true of the ARM version of Darwin ++ # that Apple uses in portable devices. ++ UNAME_PROCESSOR=x86_64 ++ fi + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` +- if test "$UNAME_PROCESSOR" = "x86"; then ++ if test "$UNAME_PROCESSOR" = x86; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi +@@ -1256,12 +1337,15 @@ + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; +- NSE-?:NONSTOP_KERNEL:*:*) ++ NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit ;; ++ NSX-?:NONSTOP_KERNEL:*:*) ++ echo nsx-tandem-nsk${UNAME_RELEASE} ++ exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit ;; +@@ -1275,7 +1359,7 @@ + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. +- if test "$cputype" = "386"; then ++ if test "$cputype" = 386; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" +@@ -1317,7 +1401,7 @@ + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) +- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' ++ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos +@@ -1328,174 +1412,25 @@ + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; +-esac +- +-#echo '(No uname command or uname output not recognized.)' 1>&2 +-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +- +-eval $set_cc_for_build +-cat >$dummy.c < +-# include +-#endif +-main () +-{ +-#if defined (sony) +-#if defined (MIPSEB) +- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, +- I don't know.... */ +- printf ("mips-sony-bsd\n"); exit (0); +-#else +-#include +- printf ("m68k-sony-newsos%s\n", +-#ifdef NEWSOS4 +- "4" +-#else +- "" +-#endif +- ); exit (0); +-#endif +-#endif +- +-#if defined (__arm) && defined (__acorn) && defined (__unix) +- printf ("arm-acorn-riscix\n"); exit (0); +-#endif +- +-#if defined (hp300) && !defined (hpux) +- printf ("m68k-hp-bsd\n"); exit (0); +-#endif +- +-#if defined (NeXT) +-#if !defined (__ARCHITECTURE__) +-#define __ARCHITECTURE__ "m68k" +-#endif +- int version; +- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; +- if (version < 4) +- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); +- else +- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); +- exit (0); +-#endif +- +-#if defined (MULTIMAX) || defined (n16) +-#if defined (UMAXV) +- printf ("ns32k-encore-sysv\n"); exit (0); +-#else +-#if defined (CMU) +- printf ("ns32k-encore-mach\n"); exit (0); +-#else +- printf ("ns32k-encore-bsd\n"); exit (0); +-#endif +-#endif +-#endif +- +-#if defined (__386BSD__) +- printf ("i386-pc-bsd\n"); exit (0); +-#endif +- +-#if defined (sequent) +-#if defined (i386) +- printf ("i386-sequent-dynix\n"); exit (0); +-#endif +-#if defined (ns32000) +- printf ("ns32k-sequent-dynix\n"); exit (0); +-#endif +-#endif +- +-#if defined (_SEQUENT_) +- struct utsname un; +- +- uname(&un); +- +- if (strncmp(un.version, "V2", 2) == 0) { +- printf ("i386-sequent-ptx2\n"); exit (0); +- } +- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ +- printf ("i386-sequent-ptx1\n"); exit (0); +- } +- printf ("i386-sequent-ptx\n"); exit (0); +- +-#endif +- +-#if defined (vax) +-# if !defined (ultrix) +-# include +-# if defined (BSD) +-# if BSD == 43 +- printf ("vax-dec-bsd4.3\n"); exit (0); +-# else +-# if BSD == 199006 +- printf ("vax-dec-bsd4.3reno\n"); exit (0); +-# else +- printf ("vax-dec-bsd\n"); exit (0); +-# endif +-# endif +-# else +- printf ("vax-dec-bsd\n"); exit (0); +-# endif +-# else +- printf ("vax-dec-ultrix\n"); exit (0); +-# endif +-#endif +- +-#if defined (alliant) && defined (i860) +- printf ("i860-alliant-bsd\n"); exit (0); +-#endif +- +- exit (1); +-} +-EOF +- +-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && +- { echo "$SYSTEM_NAME"; exit; } +- +-# Apollos put the system type in the environment. +- +-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } +- +-# Convex versions that predate uname can use getsysinfo(1) +- +-if [ -x /usr/convex/getsysinfo ] +-then +- case `getsysinfo -f cpu_type` in +- c1*) +- echo c1-convex-bsd +- exit ;; +- c2*) +- if getsysinfo -f scalar_acc +- then echo c32-convex-bsd +- else echo c2-convex-bsd +- fi +- exit ;; +- c34*) +- echo c34-convex-bsd ++ amd64:Isilon\ OneFS:*:*) ++ echo x86_64-unknown-onefs + exit ;; +- c38*) +- echo c38-convex-bsd +- exit ;; +- c4*) +- echo c4-convex-bsd +- exit ;; +- esac +-fi ++esac + + cat >&2 < in order to provide the needed +-information to handle your system. ++If $0 has already been updated, send the following data and any ++information you think might be pertinent to config-patches@gnu.org to ++provide the necessary information to handle your system. + + config.guess timestamp = $timestamp + +--- a/config/config.guess 2008-10-07 10:17:26.000000000 +0200 ++++ b/config/config.guess 2017-02-27 21:12:03.000000000 +0100 +@@ -1,14 +1,12 @@ + #! /bin/sh + # Attempt to guess a canonical system name. +-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +-# Free Software Foundation, Inc. ++# Copyright 1992-2017 Free Software Foundation, Inc. + +-timestamp='2008-01-23' ++timestamp='2017-02-07' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2 of the License, or ++# the Free Software Foundation; either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, but +@@ -17,26 +15,22 @@ + # General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. +- +- +-# Originally written by Per Bothner . +-# Please send patches to . Submit a context +-# diff and a properly formatted ChangeLog entry. ++# the same distribution terms that you use for the rest of that ++# program. This Exception is an additional permission under section 7 ++# of the GNU General Public License, version 3 ("GPLv3"). + # +-# This script attempts to guess a canonical system name similar to +-# config.sub. If it succeeds, it prints the system name on stdout, and +-# exits with 0. Otherwise, it exits with 1. ++# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. + # +-# The plan is that this can be called by configure scripts if you +-# don't specify an explicit build system type. ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess ++# ++# Please send patches to . ++ + + me=`echo "$0" | sed -e 's,.*/,,'` + +@@ -56,8 +50,7 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++Copyright 1992-2017 Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -139,12 +132,33 @@ + UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown + UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + ++case "${UNAME_SYSTEM}" in ++Linux|GNU|GNU/*) ++ # If the system lacks a compiler, then just pick glibc. ++ # We could probably try harder. ++ LIBC=gnu ++ ++ eval $set_cc_for_build ++ cat <<-EOF > $dummy.c ++ #include ++ #if defined(__UCLIBC__) ++ LIBC=uclibc ++ #elif defined(__dietlibc__) ++ LIBC=dietlibc ++ #else ++ LIBC=gnu ++ #endif ++ EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` ++ ;; ++esac ++ + # Note: order is significant - the case branches are not exclusive. + + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or +- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward +@@ -154,23 +168,33 @@ + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" +- UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ +- /usr/sbin/$sysctl 2>/dev/null || echo unknown)` ++ UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ ++ /sbin/$sysctl 2>/dev/null || \ ++ /usr/sbin/$sysctl 2>/dev/null || \ ++ echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; ++ earmv*) ++ arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` ++ endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` ++ machine=${arch}${endian}-unknown ++ ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched +- # to ELF recently, or will in the future. ++ # to ELF recently (or will in the future) and ABI. + case "${UNAME_MACHINE_ARCH}" in ++ earm*) ++ os=netbsdelf ++ ;; + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ +- | grep __ELF__ >/dev/null ++ | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? +@@ -180,7 +204,14 @@ + fi + ;; + *) +- os=netbsd ++ os=netbsd ++ ;; ++ esac ++ # Determine ABI tags. ++ case "${UNAME_MACHINE_ARCH}" in ++ earm*) ++ expr='s/^earmv[0-9]/-eabi/;s/eb$//' ++ abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + ;; + esac + # The OS release +@@ -193,18 +224,26 @@ + release='-gnu' + ;; + *) +- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ++ release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. +- echo "${machine}-${os}${release}" ++ echo "${machine}-${os}${release}${abi}" ++ exit ;; ++ *:Bitrig:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; ++ *:LibertyBSD:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} ++ exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; +@@ -217,13 +256,16 @@ + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; ++ *:Sortix:*:*) ++ echo ${UNAME_MACHINE}-unknown-sortix ++ exit ;; + alpha:OSF1:*:*) + case $UNAME_RELEASE in + *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) +- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on +@@ -233,43 +275,46 @@ + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") +- UNAME_MACHINE="alpha" ;; ++ UNAME_MACHINE=alpha ;; + "EV4.5 (21064)") +- UNAME_MACHINE="alpha" ;; ++ UNAME_MACHINE=alpha ;; + "LCA4 (21066/21068)") +- UNAME_MACHINE="alpha" ;; ++ UNAME_MACHINE=alpha ;; + "EV5 (21164)") +- UNAME_MACHINE="alphaev5" ;; ++ UNAME_MACHINE=alphaev5 ;; + "EV5.6 (21164A)") +- UNAME_MACHINE="alphaev56" ;; ++ UNAME_MACHINE=alphaev56 ;; + "EV5.6 (21164PC)") +- UNAME_MACHINE="alphapca56" ;; ++ UNAME_MACHINE=alphapca56 ;; + "EV5.7 (21164PC)") +- UNAME_MACHINE="alphapca57" ;; ++ UNAME_MACHINE=alphapca57 ;; + "EV6 (21264)") +- UNAME_MACHINE="alphaev6" ;; ++ UNAME_MACHINE=alphaev6 ;; + "EV6.7 (21264A)") +- UNAME_MACHINE="alphaev67" ;; ++ UNAME_MACHINE=alphaev67 ;; + "EV6.8CB (21264C)") +- UNAME_MACHINE="alphaev68" ;; ++ UNAME_MACHINE=alphaev68 ;; + "EV6.8AL (21264B)") +- UNAME_MACHINE="alphaev68" ;; ++ UNAME_MACHINE=alphaev68 ;; + "EV6.8CX (21264D)") +- UNAME_MACHINE="alphaev68" ;; ++ UNAME_MACHINE=alphaev68 ;; + "EV6.9A (21264/EV69A)") +- UNAME_MACHINE="alphaev69" ;; ++ UNAME_MACHINE=alphaev69 ;; + "EV7 (21364)") +- UNAME_MACHINE="alphaev7" ;; ++ UNAME_MACHINE=alphaev7 ;; + "EV7.9 (21364A)") +- UNAME_MACHINE="alphaev79" ;; ++ UNAME_MACHINE=alphaev79 ;; + esac + # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. +- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit ;; ++ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` ++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ++ exitcode=$? ++ trap '' 0 ++ exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead +@@ -295,12 +340,12 @@ + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) +- echo powerpc-ibm-os400 ++ echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; +- arm:riscos:*:*|arm:RISCOS:*:*) ++ arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) +@@ -324,14 +369,33 @@ + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; ++ s390x:SunOS:*:*) ++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux${UNAME_RELEASE} ++ exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) +- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ eval $set_cc_for_build ++ SUN_ARCH=i386 ++ # If there is a compiler, see if it is configured for 64-bit objects. ++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ++ # This test works for both compilers. ++ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then ++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ SUN_ARCH=x86_64 ++ fi ++ fi ++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize +@@ -353,7 +417,7 @@ + exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` +- test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 ++ test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} +@@ -375,23 +439,23 @@ + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit ;; ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) +- echo m68k-milan-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) +- echo m68k-hades-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) +- echo m68k-unknown-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; +@@ -461,8 +525,8 @@ + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) +- # DG/UX returns AViiON for all architectures +- UNAME_PROCESSOR=`/usr/bin/uname -p` ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ +@@ -475,7 +539,7 @@ + else + echo i586-dg-dgux${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; +@@ -532,15 +596,16 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; +- *:AIX:*:[456]) ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi +- if [ -x /usr/bin/oslevel ] ; then +- IBM_REV=`/usr/bin/oslevel` ++ if [ -x /usr/bin/lslpp ] ; then ++ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | ++ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi +@@ -575,58 +640,58 @@ + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` +- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` +- case "${sc_cpu_version}" in +- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 +- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 +- 532) # CPU_PA_RISC2_0 +- case "${sc_kernel_bits}" in +- 32) HP_ARCH="hppa2.0n" ;; +- 64) HP_ARCH="hppa2.0w" ;; +- '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 +- esac ;; +- esac ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "${sc_cpu_version}" in ++ 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH=hppa2.0n ;; ++ 64) HP_ARCH=hppa2.0w ;; ++ '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 ++ esac ;; ++ esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ sed 's/^ //' << EOF >$dummy.c + +- #define _HPUX_SOURCE +- #include +- #include +- +- int main () +- { +- #if defined(_SC_KERNEL_BITS) +- long bits = sysconf(_SC_KERNEL_BITS); +- #endif +- long cpu = sysconf (_SC_CPU_VERSION); +- +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; +- case CPU_PA_RISC2_0: +- #if defined(_SC_KERNEL_BITS) +- switch (bits) +- { +- case 64: puts ("hppa2.0w"); break; +- case 32: puts ("hppa2.0n"); break; +- default: puts ("hppa2.0"); break; +- } break; +- #else /* !defined(_SC_KERNEL_BITS) */ +- puts ("hppa2.0"); break; +- #endif +- default: puts ("hppa1.0"); break; +- } +- exit (0); +- } ++ #define _HPUX_SOURCE ++ #include ++ #include ++ ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); ++ ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } + EOF +- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` ++ (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; + esac +- if [ ${HP_ARCH} = "hppa2.0w" ] ++ if [ ${HP_ARCH} = hppa2.0w ] + then + eval $set_cc_for_build + +@@ -639,12 +704,12 @@ + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + +- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | +- grep __LP64__ >/dev/null ++ if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | ++ grep -q __LP64__ + then +- HP_ARCH="hppa2.0w" ++ HP_ARCH=hppa2.0w + else +- HP_ARCH="hppa64" ++ HP_ARCH=hppa64 + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} +@@ -711,22 +776,22 @@ + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd +- exit ;; ++ exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit ;; ++ exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd +- exit ;; ++ exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd +- exit ;; ++ exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd +- exit ;; ++ exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; +@@ -749,15 +814,15 @@ + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) +- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` +- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit ;; ++ FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` ++ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; + 5000:UNIX_System_V:4.*:*) +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` +- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +@@ -769,34 +834,39 @@ + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) +- case ${UNAME_MACHINE} in +- pc98) +- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) +- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; ++ *:MINGW64*:*) ++ echo ${UNAME_MACHINE}-pc-mingw64 ++ exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; ++ *:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit ;; + i*:windows32*:*) +- # uname -m includes "-pc" on this system. +- echo ${UNAME_MACHINE}-mingw32 ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; +- *:Interix*:[3456]*) +- case ${UNAME_MACHINE} in ++ *:Interix*:*) ++ case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; +- EM64T | authenticamd) ++ authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) +@@ -806,6 +876,9 @@ + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; ++ 8664:Windows_NT:*) ++ echo x86_64-pc-mks ++ exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we +@@ -826,210 +899,169 @@ + exit ;; + *:GNU:*:*) + # the GNU system +- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` ++ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland +- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu ++ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; ++ aarch64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ aarch64_be:Linux:*:*) ++ UNAME_MACHINE=aarch64_be ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC=gnulibc1 ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ arc:Linux:*:* | arceb:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + else +- echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf ++ fi + fi + exit ;; + avr32*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + cris:Linux:*:*) +- echo cris-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + crisv32:Linux:*:*) +- echo crisv32-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-${LIBC} ++ exit ;; ++ e2k:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + frv:Linux:*:*) +- echo frv-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ hexagon:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ i*86:Linux:*:*) ++ echo ${UNAME_MACHINE}-pc-linux-${LIBC} + exit ;; + ia64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ k1om:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m32r*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m68*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; +- mips:Linux:*:*) ++ mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU +- #undef mips +- #undef mipsel ++ #undef ${UNAME_MACHINE} ++ #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mipsel ++ CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips ++ CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif + EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^CPU/{ +- s: ::g +- p +- }'`" +- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` ++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + ;; +- mips64:Linux:*:*) +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #undef CPU +- #undef mips64 +- #undef mips64el +- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mips64el +- #else +- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips64 +- #else +- CPU= +- #endif +- #endif +-EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^CPU/{ +- s: ::g +- p +- }'`" +- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } +- ;; +- or32:Linux:*:*) +- echo or32-unknown-linux-gnu ++ mips64el:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; +- ppc:Linux:*:*) +- echo powerpc-unknown-linux-gnu ++ openrisc*:Linux:*:*) ++ echo or1k-unknown-linux-${LIBC} + exit ;; +- ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-gnu ++ or32:Linux:*:* | or1k*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; +- alpha:Linux:*:*) +- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in +- EV5) UNAME_MACHINE=alphaev5 ;; +- EV56) UNAME_MACHINE=alphaev56 ;; +- PCA56) UNAME_MACHINE=alphapca56 ;; +- PCA57) UNAME_MACHINE=alphapca56 ;; +- EV6) UNAME_MACHINE=alphaev6 ;; +- EV67) UNAME_MACHINE=alphaev67 ;; +- EV68*) UNAME_MACHINE=alphaev68 ;; +- esac +- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null +- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi +- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ padre:Linux:*:*) ++ echo sparc-unknown-linux-${LIBC} ++ exit ;; ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-${LIBC} + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +- PA7*) echo hppa1.1-unknown-linux-gnu ;; +- PA8*) echo hppa2.0-unknown-linux-gnu ;; +- *) echo hppa-unknown-linux-gnu ;; ++ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; ++ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; ++ *) echo hppa-unknown-linux-${LIBC} ;; + esac + exit ;; +- parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-gnu ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-${LIBC} ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-${LIBC} ++ exit ;; ++ ppc64le:Linux:*:*) ++ echo powerpc64le-unknown-linux-${LIBC} ++ exit ;; ++ ppcle:Linux:*:*) ++ echo powerpcle-unknown-linux-${LIBC} ++ exit ;; ++ riscv32:Linux:*:* | riscv64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) +- echo ${UNAME_MACHINE}-ibm-linux ++ echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + exit ;; + sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sh*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ tile*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + vax:Linux:*:*) +- echo ${UNAME_MACHINE}-dec-linux-gnu ++ echo ${UNAME_MACHINE}-dec-linux-${LIBC} + exit ;; + x86_64:Linux:*:*) +- echo x86_64-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-pc-linux-${LIBC} + exit ;; + xtensa*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; +- i*86:Linux:*:*) +- # The BFD linker knows what the default object file format is, so +- # first see if it will tell us. cd to the root directory to prevent +- # problems with other programs or directories called `ld' in the path. +- # Set LC_ALL=C to ensure ld outputs messages in English. +- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ +- | sed -ne '/supported targets:/!d +- s/[ ][ ]*/ /g +- s/.*supported targets: *// +- s/ .*// +- p'` +- case "$ld_supported_targets" in +- elf32-i386) +- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" +- ;; +- a.out-i386-linux) +- echo "${UNAME_MACHINE}-pc-linux-gnuaout" +- exit ;; +- coff-i386) +- echo "${UNAME_MACHINE}-pc-linux-gnucoff" +- exit ;; +- "") +- # Either a pre-BFD a.out linker (linux-gnuoldld) or +- # one that does not give us useful --help. +- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" +- exit ;; +- esac +- # Determine whether the default compiler is a.out or elf +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include +- #ifdef __ELF__ +- # ifdef __GLIBC__ +- # if __GLIBC__ >= 2 +- LIBC=gnu +- # else +- LIBC=gnulibc1 +- # endif +- # else +- LIBC=gnulibc1 +- # endif +- #else +- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) +- LIBC=gnu +- #else +- LIBC=gnuaout +- #endif +- #endif +- #ifdef __dietlibc__ +- LIBC=dietlibc +- #endif +-EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^LIBC/{ +- s: ::g +- p +- }'`" +- test x"${LIBC}" != x && { +- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" +- exit +- } +- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } +- ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both +@@ -1037,11 +1069,11 @@ + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) +- # Unixware is an offshoot of SVR4, but it has its own version +- # number series starting with 2... +- # I am not positive that other SVR4 systems won't match this, ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. +- # Use sysv4.2uw... so that sysv4* matches it. ++ # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) +@@ -1058,7 +1090,7 @@ + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; +- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) +@@ -1073,7 +1105,7 @@ + fi + exit ;; + i*86:*:5:[678]*) +- # UnixWare 7.x, OpenUNIX and OpenServer 6. ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; +@@ -1101,10 +1133,13 @@ + exit ;; + pc:*:*:*) + # Left here for compatibility: +- # uname -m prints for DJGPP always 'pc', but it prints nothing about +- # the processor, so we play safe by assuming i386. +- echo i386-pc-msdosdjgpp +- exit ;; ++ # uname -m prints for DJGPP always 'pc', but it prints nothing about ++ # the processor, so we play safe by assuming i586. ++ # Note: whatever this is, it MUST be the same as what config.sub ++ # prints for the "djgpp" host, or else GDB configure will decide that ++ # this is a cross-build. ++ echo i586-pc-msdosdjgpp ++ exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; +@@ -1139,8 +1174,18 @@ + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && { echo i486-ncr-sysv4; exit; } ;; ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; ++ NCR*:*:4.2:* | MPRAS*:*:4.2:*) ++ OS_REL='.3' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; +@@ -1153,7 +1198,7 @@ + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; +- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) +@@ -1173,10 +1218,10 @@ + echo ns32k-sni-sysv + fi + exit ;; +- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says +- echo i586-unisys-sysv4 +- exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says ++ echo i586-unisys-sysv4 ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm +@@ -1202,11 +1247,11 @@ + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then +- echo mips-nec-sysv${UNAME_RELEASE} ++ echo mips-nec-sysv${UNAME_RELEASE} + else +- echo mips-unknown-sysv${UNAME_RELEASE} ++ echo mips-unknown-sysv${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; +@@ -1216,6 +1261,12 @@ + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; ++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. ++ echo i586-pc-haiku ++ exit ;; ++ x86_64:Haiku:*:*) ++ echo x86_64-unknown-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; +@@ -1234,6 +1285,9 @@ + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; ++ SX-ACE:SUPER-UX:*:*) ++ echo sxace-nec-superux${UNAME_RELEASE} ++ exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; +@@ -1242,14 +1296,36 @@ + exit ;; + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown +- case $UNAME_PROCESSOR in +- unknown) UNAME_PROCESSOR=powerpc ;; +- esac ++ eval $set_cc_for_build ++ if test "$UNAME_PROCESSOR" = unknown ; then ++ UNAME_PROCESSOR=powerpc ++ fi ++ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then ++ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ case $UNAME_PROCESSOR in ++ i386) UNAME_PROCESSOR=x86_64 ;; ++ powerpc) UNAME_PROCESSOR=powerpc64 ;; ++ esac ++ fi ++ fi ++ elif test "$UNAME_PROCESSOR" = i386 ; then ++ # Avoid executing cc on OS X 10.9, as it ships with a stub ++ # that puts up a graphical alert prompting to install ++ # developer tools. Any system running Mac OS X 10.7 or ++ # later (Darwin 11 and later) is required to have a 64-bit ++ # processor. This is not true of the ARM version of Darwin ++ # that Apple uses in portable devices. ++ UNAME_PROCESSOR=x86_64 ++ fi + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` +- if test "$UNAME_PROCESSOR" = "x86"; then ++ if test "$UNAME_PROCESSOR" = x86; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi +@@ -1258,12 +1334,18 @@ + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; +- NSE-?:NONSTOP_KERNEL:*:*) ++ NEO-?:NONSTOP_KERNEL:*:*) ++ echo neo-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit ;; ++ NSX-?:NONSTOP_KERNEL:*:*) ++ echo nsx-tandem-nsk${UNAME_RELEASE} ++ exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit ;; +@@ -1277,7 +1359,7 @@ + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. +- if test "$cputype" = "386"; then ++ if test "$cputype" = 386; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" +@@ -1303,13 +1385,13 @@ + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) +- echo mips-sei-seiux${UNAME_RELEASE} ++ echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) +- UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; +@@ -1319,179 +1401,36 @@ + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) +- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' ++ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; +-esac +- +-#echo '(No uname command or uname output not recognized.)' 1>&2 +-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +- +-eval $set_cc_for_build +-cat >$dummy.c < +-# include +-#endif +-main () +-{ +-#if defined (sony) +-#if defined (MIPSEB) +- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, +- I don't know.... */ +- printf ("mips-sony-bsd\n"); exit (0); +-#else +-#include +- printf ("m68k-sony-newsos%s\n", +-#ifdef NEWSOS4 +- "4" +-#else +- "" +-#endif +- ); exit (0); +-#endif +-#endif +- +-#if defined (__arm) && defined (__acorn) && defined (__unix) +- printf ("arm-acorn-riscix\n"); exit (0); +-#endif +- +-#if defined (hp300) && !defined (hpux) +- printf ("m68k-hp-bsd\n"); exit (0); +-#endif +- +-#if defined (NeXT) +-#if !defined (__ARCHITECTURE__) +-#define __ARCHITECTURE__ "m68k" +-#endif +- int version; +- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; +- if (version < 4) +- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); +- else +- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); +- exit (0); +-#endif +- +-#if defined (MULTIMAX) || defined (n16) +-#if defined (UMAXV) +- printf ("ns32k-encore-sysv\n"); exit (0); +-#else +-#if defined (CMU) +- printf ("ns32k-encore-mach\n"); exit (0); +-#else +- printf ("ns32k-encore-bsd\n"); exit (0); +-#endif +-#endif +-#endif +- +-#if defined (__386BSD__) +- printf ("i386-pc-bsd\n"); exit (0); +-#endif +- +-#if defined (sequent) +-#if defined (i386) +- printf ("i386-sequent-dynix\n"); exit (0); +-#endif +-#if defined (ns32000) +- printf ("ns32k-sequent-dynix\n"); exit (0); +-#endif +-#endif +- +-#if defined (_SEQUENT_) +- struct utsname un; +- +- uname(&un); +- +- if (strncmp(un.version, "V2", 2) == 0) { +- printf ("i386-sequent-ptx2\n"); exit (0); +- } +- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ +- printf ("i386-sequent-ptx1\n"); exit (0); +- } +- printf ("i386-sequent-ptx\n"); exit (0); +- +-#endif +- +-#if defined (vax) +-# if !defined (ultrix) +-# include +-# if defined (BSD) +-# if BSD == 43 +- printf ("vax-dec-bsd4.3\n"); exit (0); +-# else +-# if BSD == 199006 +- printf ("vax-dec-bsd4.3reno\n"); exit (0); +-# else +- printf ("vax-dec-bsd\n"); exit (0); +-# endif +-# endif +-# else +- printf ("vax-dec-bsd\n"); exit (0); +-# endif +-# else +- printf ("vax-dec-ultrix\n"); exit (0); +-# endif +-#endif +- +-#if defined (alliant) && defined (i860) +- printf ("i860-alliant-bsd\n"); exit (0); +-#endif +- +- exit (1); +-} +-EOF +- +-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && +- { echo "$SYSTEM_NAME"; exit; } +- +-# Apollos put the system type in the environment. +- +-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } +- +-# Convex versions that predate uname can use getsysinfo(1) +- +-if [ -x /usr/convex/getsysinfo ] +-then +- case `getsysinfo -f cpu_type` in +- c1*) +- echo c1-convex-bsd +- exit ;; +- c2*) +- if getsysinfo -f scalar_acc +- then echo c32-convex-bsd +- else echo c2-convex-bsd +- fi ++ i*86:AROS:*:*) ++ echo ${UNAME_MACHINE}-pc-aros + exit ;; +- c34*) +- echo c34-convex-bsd +- exit ;; +- c38*) +- echo c38-convex-bsd ++ x86_64:VMkernel:*:*) ++ echo ${UNAME_MACHINE}-unknown-esx + exit ;; +- c4*) +- echo c4-convex-bsd ++ amd64:Isilon\ OneFS:*:*) ++ echo x86_64-unknown-onefs + exit ;; +- esac +-fi ++esac + + cat >&2 < in order to provide the needed +-information to handle your system. ++If $0 has already been updated, send the following data and any ++information you think might be pertinent to config-patches@gnu.org to ++provide the necessary information to handle your system. + + config.guess timestamp = $timestamp + diff --git a/build/pkgs/giac/patches/macos-ifactor.patch b/build/pkgs/giac/patches/macos-ifactor.patch index 258aa3dbb64..b2a1050619e 100644 --- a/build/pkgs/giac/patches/macos-ifactor.patch +++ b/build/pkgs/giac/patches/macos-ifactor.patch @@ -1,6 +1,6 @@ --- a/src/ifactor.cc 2014-10-11 16:29:01.000000000 +0200 +++ b/src/ifactor.cc 2014-10-11 16:29:28.000000000 +0200 -@@ -3708,7 +3708,7 @@ +@@ -3737,7 +3737,7 @@ return giac_ifactors(n0._VECTptr->front(),contextptr); #ifdef HAVE_LIBPARI #ifdef __APPLE__ diff --git a/build/pkgs/giac/patches/nofltk-check.patch b/build/pkgs/giac/patches/nofltk-check.patch index 67eb82e8ed7..a98993becee 100644 --- a/build/pkgs/giac/patches/nofltk-check.patch +++ b/build/pkgs/giac/patches/nofltk-check.patch @@ -192,13 +192,13 @@ diff -ruN check/TP00-sol.cas.out1 check.new/TP00-sol.cas.out1 +++ b/check/TP00-sol.cas.out1 2015-03-02 15:44:22.000000000 +0100 @@ -66,7 +66,7 @@ 5, - (sqrt(5)-1)/4+(I)*sqrt(2*sqrt(5)+10)/4, + (sqrt(5)-1)/4+I*sqrt(2*sqrt(5)+10)/4, "Done", - (i,j,k)->if k=1 then segment(a^i,a^j); else seq(arc(a^i,a^j,l/k),l=(1 .. k)); + (i,j,k)->if k=1 then segment(a^i,a^j,'color'=56); else seq(arc(a^i,a^j,l/k,'color'=56),l=(1 .. k)); fi , "Done", - pnt(pnt[(sqrt(5)-1)/4+(I)*sqrt(2*sqrt(5)+10)/4,1048580]),pnt(pnt[((sqrt(5)-1)/4+(I)*sqrt(2*sqrt(5)+10)/4)^2,1048580]),pnt(pnt[((sqrt(5)-1)/4+(I)*sqrt(2*sqrt(5)+10)/4)^3,1048580]),pnt(pnt[((sqrt(5)-1)/4+(I)*sqrt(2*sqrt(5)+10)/4)^4,1048580]),pnt(pnt[((sqrt(5)-1)/4+(I)*sqrt(2*sqrt(5)+10)/4)^5,1048580]), + pnt(pnt[(sqrt(5)-1)/4+I*sqrt(2*sqrt(5)+10)/4,1048580]),pnt(pnt[((sqrt(5)-1)/4+I*sqrt(2*sqrt(5)+10)/4)^2,1048580]),pnt(pnt[((sqrt(5)-1)/4+I*sqrt(2*sqrt(5)+10)/4)^3,1048580]),pnt(pnt[((sqrt(5)-1)/4+I*sqrt(2*sqrt(5)+10)/4)^4,1048580]),pnt(pnt[((sqrt(5)-1)/4+I*sqrt(2*sqrt(5)+10)/4)^5,1048580]), diff -ruN check/TP02-sol.cas check.new/TP02-sol.cas --- a/check/TP02-sol.cas 2014-06-26 17:24:46.000000000 +0200 +++ b/check/TP02-sol.cas 2015-03-02 15:38:02.000000000 +0100 diff --git a/build/pkgs/giac/patches/ticket-22315.patch b/build/pkgs/giac/patches/ticket-22315.patch new file mode 100644 index 00000000000..b792988b15c --- /dev/null +++ b/build/pkgs/giac/patches/ticket-22315.patch @@ -0,0 +1,94 @@ +diff -ruN a/Makefile.am b/Makefile.am +--- a/Makefile.am 2017-02-06 16:01:16.484367300 +0100 ++++ b/Makefile.am 2017-02-06 16:06:28.013569300 +0100 +@@ -8,18 +8,18 @@ + ## FIXME: installing autoconf-generated config.h is just PLAIN WRONG. + + install-exec-hook: +- cp config.h $(DESTDIR)/$(includedir)/giac +- ./mkinstalldirs $(DESTDIR)/$(prefix)/share/ +- ./mkinstalldirs $(DESTDIR)/$(prefix)/share/pixmaps +- cp xcas.xpm $(DESTDIR)/$(prefix)/share/pixmaps/xcas.xpm +- ./mkinstalldirs $(DESTDIR)/$(prefix)/share/applications +- cp xcas.desktop $(DESTDIR)/$(prefix)/share/applications/xcas.desktop +- ./mkinstalldirs $(DESTDIR)/$(prefix)/share/application-registry +- cp xcas.applications $(DESTDIR)/$(prefix)/share/application-registry/xcas.applications +- ./mkinstalldirs $(DESTDIR)/$(prefix)/share/icons/ +- ./mkinstalldirs $(DESTDIR)/$(prefix)/share/icons/hicolor +- for SIZE in 256 128 64 32 16; do ./mkinstalldirs $(DESTDIR)/$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE} && ./mkinstalldirs $(DESTDIR)/$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE}/apps && cp icons/xcas_$${SIZE}.png $(DESTDIR)/$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/xcas.png; done +- for SIZE in 256 128 64 32 16; do ./mkinstalldirs $(DESTDIR)/$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE}/mimetypes && cp icons/x-xcas_$${SIZE}.png $(DESTDIR)/$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE}/mimetypes/application-x-xcas.png; done ++ cp config.h $(DESTDIR)$(includedir)/giac ++ ./mkinstalldirs $(DESTDIR)$(prefix)/share/ ++ ./mkinstalldirs $(DESTDIR)$(prefix)/share/pixmaps ++ cp xcas.xpm $(DESTDIR)$(prefix)/share/pixmaps/xcas.xpm ++ ./mkinstalldirs $(DESTDIR)$(prefix)/share/applications ++ cp xcas.desktop $(DESTDIR)$(prefix)/share/applications/xcas.desktop ++ ./mkinstalldirs $(DESTDIR)$(prefix)/share/application-registry ++ cp xcas.applications $(DESTDIR)$(prefix)/share/application-registry/xcas.applications ++ ./mkinstalldirs $(DESTDIR)$(prefix)/share/icons/ ++ ./mkinstalldirs $(DESTDIR)$(prefix)/share/icons/hicolor ++ for SIZE in 256 128 64 32 16; do ./mkinstalldirs $(DESTDIR)$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE} && ./mkinstalldirs $(DESTDIR)$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE}/apps && cp icons/xcas_$${SIZE}.png $(DESTDIR)$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/xcas.png; done ++ for SIZE in 256 128 64 32 16; do ./mkinstalldirs $(DESTDIR)$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE}/mimetypes && cp icons/x-xcas_$${SIZE}.png $(DESTDIR)$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE}/mimetypes/application-x-xcas.png; done + + ACLOCAL_AMFLAGS = -I m4 + +diff -ruN a/Makefile.in b/Makefile.in +--- a/Makefile.in 2017-02-06 16:01:16.279348700 +0100 ++++ b/Makefile.in 2017-02-06 16:07:13.838103600 +0100 +@@ -847,18 +847,18 @@ + $(PACKAGE)-$(VERSION).tar.gz: dist + + install-exec-hook: +- cp config.h $(DESTDIR)/$(includedir)/giac +- ./mkinstalldirs $(DESTDIR)/$(prefix)/share/ +- ./mkinstalldirs $(DESTDIR)/$(prefix)/share/pixmaps +- cp xcas.xpm $(DESTDIR)/$(prefix)/share/pixmaps/xcas.xpm +- ./mkinstalldirs $(DESTDIR)/$(prefix)/share/applications +- cp xcas.desktop $(DESTDIR)/$(prefix)/share/applications/xcas.desktop +- ./mkinstalldirs $(DESTDIR)/$(prefix)/share/application-registry +- cp xcas.applications $(DESTDIR)/$(prefix)/share/application-registry/xcas.applications +- ./mkinstalldirs $(DESTDIR)/$(prefix)/share/icons/ +- ./mkinstalldirs $(DESTDIR)/$(prefix)/share/icons/hicolor +- for SIZE in 256 128 64 32 16; do ./mkinstalldirs $(DESTDIR)/$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE} && ./mkinstalldirs $(DESTDIR)/$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE}/apps && cp icons/xcas_$${SIZE}.png $(DESTDIR)/$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/xcas.png; done +- for SIZE in 256 128 64 32 16; do ./mkinstalldirs $(DESTDIR)/$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE}/mimetypes && cp icons/x-xcas_$${SIZE}.png $(DESTDIR)/$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE}/mimetypes/application-x-xcas.png; done ++ cp config.h $(DESTDIR)$(includedir)/giac ++ ./mkinstalldirs $(DESTDIR)$(prefix)/share/ ++ ./mkinstalldirs $(DESTDIR)$(prefix)/share/pixmaps ++ cp xcas.xpm $(DESTDIR)$(prefix)/share/pixmaps/xcas.xpm ++ ./mkinstalldirs $(DESTDIR)$(prefix)/share/applications ++ cp xcas.desktop $(DESTDIR)$(prefix)/share/applications/xcas.desktop ++ ./mkinstalldirs $(DESTDIR)$(prefix)/share/application-registry ++ cp xcas.applications $(DESTDIR)$(prefix)/share/application-registry/xcas.applications ++ ./mkinstalldirs $(DESTDIR)$(prefix)/share/icons/ ++ ./mkinstalldirs $(DESTDIR)$(prefix)/share/icons/hicolor ++ for SIZE in 256 128 64 32 16; do ./mkinstalldirs $(DESTDIR)$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE} && ./mkinstalldirs $(DESTDIR)$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE}/apps && cp icons/xcas_$${SIZE}.png $(DESTDIR)$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/xcas.png; done ++ for SIZE in 256 128 64 32 16; do ./mkinstalldirs $(DESTDIR)$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE}/mimetypes && cp icons/x-xcas_$${SIZE}.png $(DESTDIR)$(prefix)/share/icons/hicolor/$${SIZE}x$${SIZE}/mimetypes/application-x-xcas.png; done + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. +diff -ruN a/src/Makefile.am b/src/Makefile.am +--- a/src/Makefile.am 2017-02-06 16:01:51.663379800 +0100 ++++ b/src/Makefile.am 2017-02-06 16:01:25.730657700 +0100 +@@ -85,8 +85,8 @@ + bin_SCRIPTS = pgiac + + install-exec-hook: +- rm -f $(DESTDIR)$(bindir)/cas_help +- mv $(DESTDIR)/$(bindir)/aide$(EXEEXT) $(DESTDIR)$(bindir)/cas_help ++ rm -f $(DESTDIR)$(bindir)/cas_help$(EXEEXT) ++ mv $(DESTDIR)$(bindir)/aide$(EXEEXT) $(DESTDIR)$(bindir)/cas_help + ln -sf cas_help $(DESTDIR)$(bindir)/en_cas_help + ln -sf cas_help $(DESTDIR)$(bindir)/es_cas_help + ln -sf cas_help $(DESTDIR)$(bindir)/fr_cas_help +diff -ruN a/src/Makefile.in b/src/Makefile.in +--- a/src/Makefile.in 2017-02-06 16:01:52.110694800 +0100 ++++ b/src/Makefile.in 2017-02-06 16:01:25.669644700 +0100 +@@ -1030,7 +1030,7 @@ + + install-exec-hook: + rm -f $(DESTDIR)$(bindir)/cas_help +- mv $(DESTDIR)/$(bindir)/aide$(EXEEXT) $(DESTDIR)$(bindir)/cas_help ++ mv $(DESTDIR)$(bindir)/aide$(EXEEXT) $(DESTDIR)$(bindir)/cas_help + ln -sf cas_help $(DESTDIR)$(bindir)/en_cas_help + ln -sf cas_help $(DESTDIR)$(bindir)/es_cas_help + ln -sf cas_help $(DESTDIR)$(bindir)/fr_cas_help diff --git a/build/pkgs/giac/spkg-install b/build/pkgs/giac/spkg-install index dbae34651e9..d2a81cb729f 100755 --- a/build/pkgs/giac/spkg-install +++ b/build/pkgs/giac/spkg-install @@ -38,7 +38,7 @@ echo "Configuring giac..." # --disable-ao (avoid libao deps) # --disable-lapack (avoid lapack and blas deps because they could be from the base system) - +# --disable-png (avoid conflicts with system libpng12 and sage libpng16) # On OS X (10.12) the built in intl is broken DISABLENLS="" if [ "$UNAME" = "Darwin" ]; then @@ -46,7 +46,7 @@ if [ "$UNAME" = "Darwin" ]; then DISABLENLS="--disable-nls" fi -./configure --prefix="$SAGE_LOCAL" --disable-gui --disable-ao --disable-lapack "$DISABLENLS" +./configure --prefix="$SAGE_LOCAL" --disable-gui --disable-png --disable-ao --disable-lapack "$DISABLENLS" if [ $? -ne 0 ]; then exit 1 diff --git a/build/pkgs/giac/spkg-src b/build/pkgs/giac/spkg-src index 561a5d429cf..82979e608fd 100755 --- a/build/pkgs/giac/spkg-src +++ b/build/pkgs/giac/spkg-src @@ -14,8 +14,8 @@ fi set -e # TODO on the next update: l71 switch from gz to bz2 as wished in #18826 -VERSION="1.2.2" -VERSIONREV="103" +VERSION="1.2.3" +VERSIONREV="25" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/build/pkgs/git/checksums.ini b/build/pkgs/git/checksums.ini index 3a6e9681738..77c099d1526 100644 --- a/build/pkgs/git/checksums.ini +++ b/build/pkgs/git/checksums.ini @@ -1,4 +1,4 @@ tarball=git-VERSION.tar.gz -sha1=ff32a94936309ca3f0e3d56e479e7510a3c1c925 -md5=da293290da69f45a86a311ad3cd43dc8 -cksum=2025246710 +sha1=21a227ac7f3a8b3c29e6d6fbd13f7a6b958c81ed +md5=eac9324afcf4c95ab11acb2e2283e376 +cksum=2000477778 diff --git a/build/pkgs/git/package-version.txt b/build/pkgs/git/package-version.txt index 097a15a2af3..46b81d815a2 100644 --- a/build/pkgs/git/package-version.txt +++ b/build/pkgs/git/package-version.txt @@ -1 +1 @@ -2.6.2 +2.11.0 diff --git a/build/pkgs/gp2c/checksums.ini b/build/pkgs/gp2c/checksums.ini index b057d08ce7b..d8b896e2ed5 100644 --- a/build/pkgs/gp2c/checksums.ini +++ b/build/pkgs/gp2c/checksums.ini @@ -1,4 +1,4 @@ tarball=gp2c-VERSION.tar.gz -sha1=e07cebffcd09c0d644d52335130984f33042b46f -md5=3f6bb47d41ddca7b6a4938d16abbe4e8 -cksum=3338275717 +sha1=6bce2bbb69227de44fa768619d1dffa861d6470a +md5=41d3e76fb070ba7f73242b76ae5cb529 +cksum=2256538341 diff --git a/build/pkgs/gp2c/package-version.txt b/build/pkgs/gp2c/package-version.txt index e353504d336..7c1886bb9f4 100644 --- a/build/pkgs/gp2c/package-version.txt +++ b/build/pkgs/gp2c/package-version.txt @@ -1 +1 @@ -0.0.9pl5 +0.0.10 diff --git a/build/pkgs/gsl/package-version.txt b/build/pkgs/gsl/package-version.txt index da9492f78e0..80c8dd28e14 100644 --- a/build/pkgs/gsl/package-version.txt +++ b/build/pkgs/gsl/package-version.txt @@ -1 +1 @@ -2.1.p0 +2.1.p1 diff --git a/build/pkgs/gsl/patches/gsl-2.1-gslcblas.patch b/build/pkgs/gsl/patches/gsl-2.1-gslcblas.patch new file mode 100644 index 00000000000..08f6c6f6415 --- /dev/null +++ b/build/pkgs/gsl/patches/gsl-2.1-gslcblas.patch @@ -0,0 +1,16 @@ +Do not include gslcblas in .pc. We already have the selected cblas +added to libs. Which could be an external cblas if someone wanted too. + +diff --git a/gsl.pc.in b/gsl.pc.in +index 5e9ef21..3a70648 100644 +--- a/gsl.pc.in ++++ b/gsl.pc.in +@@ -2,7 +2,7 @@ prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ + includedir=@includedir@ +-GSL_CBLAS_LIB=-lgslcblas ++GSL_CBLAS_LIB= + + Name: GSL + Description: GNU Scientific Library diff --git a/build/pkgs/ipykernel/checksums.ini b/build/pkgs/ipykernel/checksums.ini index 5416b6e3460..64cbd007987 100644 --- a/build/pkgs/ipykernel/checksums.ini +++ b/build/pkgs/ipykernel/checksums.ini @@ -1,4 +1,4 @@ tarball=ipykernel-VERSION.tar.gz -sha1=1a16f3366a655edd1c0dc264fc3fe1489cf2c2df -md5=0b1150602203af298631555509a809bd -cksum=69264790 +sha1=b94d49af3a9a89eb9b4d32c63868b8fcb689de19 +md5=4048987076b85814202cd29b1dd3fc7b +cksum=1741951088 diff --git a/build/pkgs/ipykernel/package-version.txt b/build/pkgs/ipykernel/package-version.txt index 4b708b2649e..6cedcff6308 100644 --- a/build/pkgs/ipykernel/package-version.txt +++ b/build/pkgs/ipykernel/package-version.txt @@ -1 +1 @@ -4.3.1.p0 +4.5.2 diff --git a/build/pkgs/ipywidgets/checksums.ini b/build/pkgs/ipywidgets/checksums.ini index 582ce7982dd..14417ad5174 100644 --- a/build/pkgs/ipywidgets/checksums.ini +++ b/build/pkgs/ipywidgets/checksums.ini @@ -1,4 +1,4 @@ tarball=ipywidgets-VERSION.tar.gz -sha1=f4f57d78fe6e89ef87e9eee31dd9e3f15d1e8601 -md5=317e49cc76353352939c2527920f3ebe -cksum=1256350577 +sha1=3ec713b82cc415ebe63e2971cc7acae28e89d657 +md5=245c978e0ca64b9e686b716c71efb675 +cksum=3038350627 diff --git a/build/pkgs/ipywidgets/package-version.txt b/build/pkgs/ipywidgets/package-version.txt index 05a20a7fd71..09b254e90c6 100644 --- a/build/pkgs/ipywidgets/package-version.txt +++ b/build/pkgs/ipywidgets/package-version.txt @@ -1 +1 @@ -5.2.2.p1 +6.0.0 diff --git a/build/pkgs/ipywidgets/patches/remove-deprecated.patch b/build/pkgs/ipywidgets/patches/remove-deprecated.patch deleted file mode 100644 index b86a076d389..00000000000 --- a/build/pkgs/ipywidgets/patches/remove-deprecated.patch +++ /dev/null @@ -1,130 +0,0 @@ -commit d30916740f09b76f2f4ffc0e3e3b165b475ba032 -Author: Sylvain Corlay -Date: Fri May 20 17:18:52 2016 +0200 - - Remove deprecated code to support old abbreviations - -diff --git a/ipywidgets/widgets/interaction.py b/ipywidgets/widgets/interaction.py -index 2b68317..a58e3e6 100644 ---- a/ipywidgets/widgets/interaction.py -+++ b/ipywidgets/widgets/interaction.py -@@ -86,24 +86,9 @@ def _widget_abbrev_single_value(o): - def _widget_abbrev(o): - """Make widgets from abbreviations: single values, lists or tuples.""" - if isinstance(o, list): -- # -------------------------------------------------------------------- -- # Handle deprecated behavior of using lists of length 2 or 3 in place -- # of tuples to specify slider widget attributes. This will be removed -- # in ipywidgets 6.0. -- if len(o) in [2, 3] and all(isinstance(x, Real) for x in o): -- warn("For Sliders, use a tuple: %s" % (tuple(o),), DeprecationWarning) -- return _widget_abbrev(tuple(o)) -- # -------------------------------------------------------------------- - return Dropdown(options=[unicode_type(k) for k in o]) - - elif isinstance(o, tuple): -- # -------------------------------------------------------------------- -- # Handle deprecated behavior of using tuples for selection widget. This -- # will be removed in ipywidgets 6.0. -- if any(not isinstance(x, Real) for x in o): -- warn("For Selection widgets, use a list %s" %(list(o),), DeprecationWarning) -- return Dropdown(options=[unicode_type(k) for k in o]) -- # -------------------------------------------------------------------- - if _matches(o, (Real, Real)): - min, max, value = _get_min_max_value(o[0], o[1]) - if all(isinstance(_, Integral) for _ in o): -diff --git a/ipywidgets/widgets/tests/test_interaction.py b/ipywidgets/widgets/tests/test_interaction.py -index 5616cfc..0685aae 100644 ---- a/ipywidgets/widgets/tests/test_interaction.py -+++ b/ipywidgets/widgets/tests/test_interaction.py -@@ -154,87 +154,17 @@ def test_single_value_int(): - readout=True, - ) - --def test_list_tuple_2_int(): -- with nt.assert_raises(ValueError): -- c = interactive(f, tup=(1,1)) -- with nt.assert_raises(ValueError): -- c = interactive(f, tup=(1,-1)) -- for min, max in [ (0,1), (1,10), (1,2), (-5,5), (-20,-19) ]: -- c = interactive(f, tup=(min, max), lis=[min, max]) -- nt.assert_equal(len(c.children), 2) -- d = dict( -- cls=widgets.IntSlider, -- min=min, -- max=max, -- step=1, -- readout=True, -- ) -- check_widgets(c, tup=d, lis=d) -- --def test_list_tuple_3_int(): -- with nt.assert_raises(ValueError): -- c = interactive(f, tup=(1,2,0)) -- with nt.assert_raises(ValueError): -- c = interactive(f, tup=(1,2,-1)) -- for min, max, step in [ (0,2,1), (1,10,2), (1,100,2), (-5,5,4), (-100,-20,4) ]: -- c = interactive(f, tup=(min, max, step), lis=[min, max, step]) -- nt.assert_equal(len(c.children), 2) -- d = dict( -- cls=widgets.IntSlider, -- min=min, -- max=max, -- step=step, -- readout=True, -- ) -- check_widgets(c, tup=d, lis=d) -- --def test_list_tuple_2_float(): -- with nt.assert_raises(ValueError): -- c = interactive(f, tup=(1.0,1.0)) -- with nt.assert_raises(ValueError): -- c = interactive(f, tup=(0.5,-0.5)) -- for min, max in [ (0.5, 1.5), (1.1,10.2), (1,2.2), (-5.,5), (-20,-19.) ]: -- c = interactive(f, tup=(min, max), lis=[min, max]) -- nt.assert_equal(len(c.children), 2) -- d = dict( -- cls=widgets.FloatSlider, -- min=min, -- max=max, -- step=.1, -- readout=True, -- ) -- check_widgets(c, tup=d, lis=d) -- --def test_list_tuple_3_float(): -- with nt.assert_raises(ValueError): -- c = interactive(f, tup=(1,2,0.0)) -- with nt.assert_raises(ValueError): -- c = interactive(f, tup=(-1,-2,1.)) -- with nt.assert_raises(ValueError): -- c = interactive(f, tup=(1,2.,-1.)) -- for min, max, step in [ (0.,2,1), (1,10.,2), (1,100,2.), (-5.,5.,4), (-100,-20.,4.) ]: -- c = interactive(f, tup=(min, max, step), lis=[min, max, step]) -- nt.assert_equal(len(c.children), 2) -- d = dict( -- cls=widgets.FloatSlider, -- min=min, -- max=max, -- step=step, -- readout=True, -- ) -- check_widgets(c, tup=d, lis=d) -- - def test_list_tuple_str(): - values = ['hello', 'there', 'guy'] - first = values[0] -- c = interactive(f, tup=tuple(values), lis=list(values)) -- nt.assert_equal(len(c.children), 2) -+ c = interactive(f, lis=list(values)) -+ nt.assert_equal(len(c.children), 1) - d = dict( - cls=widgets.Dropdown, - value=first, - options=values - ) -- check_widgets(c, tup=d, lis=d) -+ check_widgets(c, lis=d) - - def test_list_tuple_invalid(): - for bad in [ diff --git a/build/pkgs/ipywidgets/patches/widget_repr.patch b/build/pkgs/ipywidgets/patches/widget_repr.patch new file mode 100644 index 00000000000..2611eb278a2 --- /dev/null +++ b/build/pkgs/ipywidgets/patches/widget_repr.patch @@ -0,0 +1,45 @@ +commit aadd75cb60d73638a24c8f69e5fbd0c5c8a44780 +Author: Jeroen Demeyer +Date: Thu Jan 5 17:34:52 2017 +0100 + + Add __repr__ to Widget for testing/debugging + +diff --git a/ipywidgets/widgets/widget.py b/ipywidgets/widgets/widget.py +index 8f4abd3..db474ac 100644 +--- a/ipywidgets/widgets/widget.py ++++ b/ipywidgets/widgets/widget.py +@@ -123,6 +123,34 @@ class Widget(LoggingConfigurable): + widgets = {} + widget_types = {} + ++ def __repr__(self): ++ """ ++ Textual representation of this widget, mainly used for testing ++ and debugging. ++ """ ++ # List of attributes to show with default values. The attribute ++ # is printed if it exists and its value is not equal to this ++ # default value. ++ attributes = [("value", None), ++ ("min", None), ++ ("max", None), ++ ("step", None), ++ ("options", None), ++ ("description", ""), ++ ("children", [])] ++ r = "" ++ for (attr, default) in attributes: ++ try: ++ v = getattr(self, attr) ++ except AttributeError: ++ continue ++ if default == v: ++ continue ++ if r: ++ r += ", " ++ r += attr + "=" + repr(v) ++ return "%s(%s)" % (type(self).__name__, r) ++ + @staticmethod + def on_widget_constructed(callback): + """Registers a callback to be called when a widget is constructed. diff --git a/build/pkgs/jupyter_client/checksums.ini b/build/pkgs/jupyter_client/checksums.ini index 71529ccca98..d3811b3ddf7 100644 --- a/build/pkgs/jupyter_client/checksums.ini +++ b/build/pkgs/jupyter_client/checksums.ini @@ -1,4 +1,4 @@ tarball=jupyter_client-VERSION.tar.gz -sha1=909b47a92960364300765a36963c8c9bf9c179ab -md5=4ae3d5e04baea1e8fa8d3ec24c600c17 -cksum=854482584 +sha1=1455be4a05b45051f83ae30a10d97a432fa5e01e +md5=8a428a07cbcd4f2e4ca7c2f728b718ea +cksum=1097112492 diff --git a/build/pkgs/jupyter_client/dependencies b/build/pkgs/jupyter_client/dependencies index 17f6a9dd72a..1db0ea24e7e 100644 --- a/build/pkgs/jupyter_client/dependencies +++ b/build/pkgs/jupyter_client/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) jupyter_core | pip +$(PYTHON) jupyter_core | pip pyzmq ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/jupyter_client/package-version.txt b/build/pkgs/jupyter_client/package-version.txt index 1dcc89a3546..fdc6698807a 100644 --- a/build/pkgs/jupyter_client/package-version.txt +++ b/build/pkgs/jupyter_client/package-version.txt @@ -1 +1 @@ -4.3.0.p0 +4.4.0 diff --git a/build/pkgs/jupyter_core/checksums.ini b/build/pkgs/jupyter_core/checksums.ini index d3c69242bf4..7c08a350aef 100644 --- a/build/pkgs/jupyter_core/checksums.ini +++ b/build/pkgs/jupyter_core/checksums.ini @@ -1,4 +1,4 @@ tarball=jupyter_core-VERSION.tar.gz -sha1=7836ef4bbe750048361624c6a3968ed733bf8f6a -md5=78f6add824eef72b12e0f6e6940372b3 -cksum=3147890695 +sha1=7ae489bdea8f2d117af5a9b9e1a662d51c99e696 +md5=18819511a809afdeed9a995a9c27bcfb +cksum=1313016246 diff --git a/build/pkgs/jupyter_core/package-version.txt b/build/pkgs/jupyter_core/package-version.txt index d23a8bb9147..80895903a15 100644 --- a/build/pkgs/jupyter_core/package-version.txt +++ b/build/pkgs/jupyter_core/package-version.txt @@ -1 +1 @@ -4.1.0.p0 +4.3.0 diff --git a/build/pkgs/latte_int/dependencies b/build/pkgs/latte_int/dependencies index af4589f3c69..de6feb2e92e 100644 --- a/build/pkgs/latte_int/dependencies +++ b/build/pkgs/latte_int/dependencies @@ -1,4 +1,4 @@ -$(MP_LIBRARY) ntl 4ti2 cddlib +$(MP_LIBRARY) ntl 4ti2 cddlib lrslib lidia ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/libfplll/patches/ticket-21690.patch b/build/pkgs/libfplll/patches/ticket-21690.patch new file mode 100644 index 00000000000..d697c61df22 --- /dev/null +++ b/build/pkgs/libfplll/patches/ticket-21690.patch @@ -0,0 +1,13 @@ +diff -ruN a/fplll/lll.h b/fplll/lll.h +--- a/fplll/lll.h 2016-10-12 12:07:05.211645300 +0200 ++++ b/fplll/lll.h 2016-10-12 12:07:15.049432000 +0200 +@@ -36,7 +36,9 @@ + */ + LLLReduction(MatGSO &m, double delta, double eta, int flags); + ++#ifdef FPLLL_WITH_LONG_DOUBLE + ~LLLReduction() { LDConvHelper::free(); } ++#endif + + bool lll(int kappa_min = 0, int kappa_start = 0, int kappa_end = -1); + inline bool size_reduction(int kappa_min = 0, int kappa_end = -1); diff --git a/build/pkgs/libfplll/spkg-install b/build/pkgs/libfplll/spkg-install index efc893b2926..e96c2526de5 100755 --- a/build/pkgs/libfplll/spkg-install +++ b/build/pkgs/libfplll/spkg-install @@ -10,6 +10,9 @@ cd src || exit INCLUDES="-I$SAGE_LOCAL/include/" +if [ "$UNAME" = "CYGWIN" ]; then + CXXFLAGS="$CXXFLAGS -std=gnu++11" +fi CXXFLAGS="$CXXFLAGS -fPIC $INCLUDES -L$SAGE_LOCAL/lib" CPPFLAGS="$INCLUDES" @@ -54,7 +57,7 @@ if [ $? -ne 0 ]; then fi echo "Now building fplll..." -$MAKE V=1 +$MAKE if [ $? -ne 0 ]; then echo "Error building fplll" exit 1 diff --git a/build/pkgs/libgap/checksums.ini b/build/pkgs/libgap/checksums.ini index ce8808f2d99..0dad094d1ed 100644 --- a/build/pkgs/libgap/checksums.ini +++ b/build/pkgs/libgap/checksums.ini @@ -1,4 +1,4 @@ tarball=libgap-VERSION.tar.gz -sha1=22d2f099d4743678bfb2bc7da7a215be3b8ec03e -md5=3e283da0397286b98e680804d93c6e61 -cksum=159804790 +sha1=996d925cdeae798219ab2dd7d5f4491f2e8f98f1 +md5=dd5e20228a136a5fa8e86ad3f4bcf81a +cksum=1956377298 diff --git a/build/pkgs/libgap/package-version.txt b/build/pkgs/libgap/package-version.txt index f99c6583c35..7ea59483d14 100644 --- a/build/pkgs/libgap/package-version.txt +++ b/build/pkgs/libgap/package-version.txt @@ -1 +1 @@ -4.8.3 +4.8.6 diff --git a/build/pkgs/linbox/patches/autotools/ticket-22318-autotools.patch b/build/pkgs/linbox/patches/autotools/ticket-22318-autotools.patch new file mode 100644 index 00000000000..51540378bc2 --- /dev/null +++ b/build/pkgs/linbox/patches/autotools/ticket-22318-autotools.patch @@ -0,0 +1,59 @@ +diff -ru a/configure.ac b/configure.ac +--- a/configure.ac 2017-02-06 17:36:56.899033700 +0100 ++++ b/configure.ac 2017-02-06 17:47:20.828434500 +0100 +@@ -164,7 +164,20 @@ + + # newer libtool... + LT_PREREQ([2.2]) +-LT_INIT ++LT_INIT([win32-dll]) ++ ++ ++# needed for building interfaces as shared libs on Windows ++AC_CANONICAL_HOST ++case "${host_os}" in ++ cygwin*|mingw*) ++ LINBOX_LDFLAGS=-no-undefined ++ ;; ++ *) ++ LINBOX_LDFLAGS="" ++ ;; ++esac ++AC_SUBST([LINBOX_LDFLAGS]) + + + echo "-----------------------------------------------" +diff -ru a/interfaces/driver/Makefile.am b/interfaces/driver/Makefile.am +--- a/interfaces/driver/Makefile.am 2017-02-06 17:34:39.612887500 +0100 ++++ b/interfaces/driver/Makefile.am 2017-02-06 17:47:54.367479800 +0100 +@@ -46,7 +46,7 @@ + # \ + # lb-solve.C + +-liblbdriver_la_LDFLAGS= $(NTL_LIBS) $(LDFLAGS) $(top_srcdir)/linbox/liblinbox.la -Wl,-zmuldefs ++liblbdriver_la_LDFLAGS= $(NTL_LIBS) $(LDFLAGS) $(LINBOX_LDFLAGS) $(top_srcdir)/linbox/liblinbox.la -Wl,-zmuldefs + + + +diff -ru a/interfaces/maple/Makefile.am b/interfaces/maple/Makefile.am +--- a/interfaces/maple/Makefile.am 2017-02-06 17:34:39.711925700 +0100 ++++ b/interfaces/maple/Makefile.am 2017-02-06 17:48:29.892945500 +0100 +@@ -30,7 +30,7 @@ + + liblbmaple_la_SOURCES= lb-maple.C + +-liblbmaple_la_LDFLAGS= $(NTL_LIBS) $(MAPLE_LIBS) $(top_srcdir)/interfaces/driver/liblbdriver.la -Wl,-zmuldefs $(LDFLAGS) ++liblbmaple_la_LDFLAGS= $(NTL_LIBS) $(MAPLE_LIBS) $(top_srcdir)/interfaces/driver/liblbdriver.la -Wl,-zmuldefs $(LDFLAGS) $(LINBOX_LDFLAGS) + + pkginclude_HEADERS =lb-maple.h lb-maple-utilities.h + +diff -ru a/interfaces/sage/Makefile.am b/interfaces/sage/Makefile.am +--- a/interfaces/sage/Makefile.am 2017-02-06 17:34:39.685920400 +0100 ++++ b/interfaces/sage/Makefile.am 2017-02-06 17:48:31.691793800 +0100 +@@ -38,5 +38,5 @@ + #gentoo's linbox-1.1.6-fix-undefined-symbols.patch + liblinboxsage_la_LIBADD = $(top_builddir)/linbox/liblinbox.la + +-liblinboxsage_la_LDFLAGS = $(DEPS_LIBS) $(LDFLAGS) -version-info 0:0:0 #-Wl,-zmuldefs ++liblinboxsage_la_LDFLAGS = $(DEPS_LIBS) $(LDFLAGS) $(LINBOX_LDFLAGS) -version-info 0:0:0 #-Wl,-zmuldefs + endif diff --git a/build/pkgs/linbox/patches/ticket-22318.patch b/build/pkgs/linbox/patches/ticket-22318.patch new file mode 100644 index 00000000000..aec56d952c1 --- /dev/null +++ b/build/pkgs/linbox/patches/ticket-22318.patch @@ -0,0 +1,524 @@ +diff -ru a/benchmarks/data/Makefile.in b/benchmarks/data/Makefile.in +--- a/benchmarks/data/Makefile.in 2017-02-06 17:34:41.975143500 +0100 ++++ b/benchmarks/data/Makefile.in 2017-02-06 17:49:25.244034600 +0100 +@@ -214,6 +214,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/benchmarks/Makefile.in b/benchmarks/Makefile.in +--- a/benchmarks/Makefile.in 2017-02-06 17:34:42.036008000 +0100 ++++ b/benchmarks/Makefile.in 2017-02-06 17:49:25.210033100 +0100 +@@ -353,6 +353,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/benchmarks/matrix/Makefile.in b/benchmarks/matrix/Makefile.in +--- a/benchmarks/matrix/Makefile.in 2017-02-06 17:34:41.999141900 +0100 ++++ b/benchmarks/matrix/Makefile.in 2017-02-06 17:49:25.275533500 +0100 +@@ -214,6 +214,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/configure b/configure +--- a/configure 2017-02-06 17:34:42.218522700 +0100 ++++ b/configure 2017-02-06 17:49:21.704976100 +0100 +@@ -704,6 +704,7 @@ + LINBOX_HAVE_OMP_FALSE + LINBOX_HAVE_OMP_TRUE + OMPFLAGS ++LINBOX_LDFLAGS + OTOOL64 + OTOOL + LIPO +@@ -15918,6 +15919,19 @@ + + + ++# needed for building interfaces as shared libs on Windows ++ ++case "${host_os}" in ++ cygwin*|mingw*) ++ LINBOX_LDFLAGS=-no-undefined ++ ;; ++ *) ++ LINBOX_LDFLAGS="" ++ ;; ++esac ++ ++ ++ + echo "-----------------------------------------------" + echo " START LINBOX CONFIG " + echo "-----------------------------------------------" +diff -ru a/configure.ac b/configure.ac +--- a/configure.ac 2017-02-06 17:36:56.899033700 +0100 ++++ b/configure.ac 2017-02-06 17:47:20.828434500 +0100 +@@ -164,7 +164,20 @@ + + # newer libtool... + LT_PREREQ([2.2]) +-LT_INIT ++LT_INIT([win32-dll]) ++ ++ ++# needed for building interfaces as shared libs on Windows ++AC_CANONICAL_HOST ++case "${host_os}" in ++ cygwin*|mingw*) ++ LINBOX_LDFLAGS=-no-undefined ++ ;; ++ *) ++ LINBOX_LDFLAGS="" ++ ;; ++esac ++AC_SUBST([LINBOX_LDFLAGS]) + + + echo "-----------------------------------------------" +diff -ru a/doc/Makefile.in b/doc/Makefile.in +--- a/doc/Makefile.in 2017-02-06 17:34:39.850940900 +0100 ++++ b/doc/Makefile.in 2017-02-06 17:49:25.325533100 +0100 +@@ -245,6 +245,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/examples/Makefile.in b/examples/Makefile.in +--- a/examples/Makefile.in 2017-02-06 17:34:39.395831100 +0100 ++++ b/examples/Makefile.in 2017-02-06 17:49:25.380594300 +0100 +@@ -358,6 +358,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/interfaces/driver/Makefile.am b/interfaces/driver/Makefile.am +--- a/interfaces/driver/Makefile.am 2017-02-06 17:34:39.612887500 +0100 ++++ b/interfaces/driver/Makefile.am 2017-02-06 17:47:54.367479800 +0100 +@@ -46,7 +46,7 @@ + # \ + # lb-solve.C + +-liblbdriver_la_LDFLAGS= $(NTL_LIBS) $(LDFLAGS) $(top_srcdir)/linbox/liblinbox.la -Wl,-zmuldefs ++liblbdriver_la_LDFLAGS= $(NTL_LIBS) $(LDFLAGS) $(LINBOX_LDFLAGS) $(top_srcdir)/linbox/liblinbox.la -Wl,-zmuldefs + + + +diff -ru a/interfaces/driver/Makefile.in b/interfaces/driver/Makefile.in +--- a/interfaces/driver/Makefile.in 2017-02-06 17:34:39.537872700 +0100 ++++ b/interfaces/driver/Makefile.in 2017-02-06 17:49:25.458653400 +0100 +@@ -315,6 +315,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -444,7 +445,7 @@ + + # \ + # # lb-solve.C +-@LINBOX_COMPILE_DRIVERS_TRUE@liblbdriver_la_LDFLAGS = $(NTL_LIBS) $(LDFLAGS) $(top_srcdir)/linbox/liblinbox.la -Wl,-zmuldefs ++@LINBOX_COMPILE_DRIVERS_TRUE@liblbdriver_la_LDFLAGS = $(NTL_LIBS) $(LDFLAGS) $(LINBOX_LDFLAGS) $(top_srcdir)/linbox/liblinbox.la -Wl,-zmuldefs + @LINBOX_COMPILE_DRIVERS_TRUE@pkginclude_HEADERS = \ + @LINBOX_COMPILE_DRIVERS_TRUE@ lb-driver.h \ + @LINBOX_COMPILE_DRIVERS_TRUE@ lb-blackbox-abstract.h \ +diff -ru a/interfaces/kaapi/Makefile.in b/interfaces/kaapi/Makefile.in +--- a/interfaces/kaapi/Makefile.in 2017-02-06 17:34:39.661926000 +0100 ++++ b/interfaces/kaapi/Makefile.in 2017-02-06 17:49:25.495152600 +0100 +@@ -261,6 +261,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/interfaces/Makefile.in b/interfaces/Makefile.in +--- a/interfaces/Makefile.in 2017-02-06 17:34:39.693925700 +0100 ++++ b/interfaces/Makefile.in 2017-02-06 17:49:25.416594200 +0100 +@@ -272,6 +272,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/interfaces/maple/Makefile.am b/interfaces/maple/Makefile.am +--- a/interfaces/maple/Makefile.am 2017-02-06 17:34:39.711925700 +0100 ++++ b/interfaces/maple/Makefile.am 2017-02-06 17:48:29.892945500 +0100 +@@ -30,7 +30,7 @@ + + liblbmaple_la_SOURCES= lb-maple.C + +-liblbmaple_la_LDFLAGS= $(NTL_LIBS) $(MAPLE_LIBS) $(top_srcdir)/interfaces/driver/liblbdriver.la -Wl,-zmuldefs $(LDFLAGS) ++liblbmaple_la_LDFLAGS= $(NTL_LIBS) $(MAPLE_LIBS) $(top_srcdir)/interfaces/driver/liblbdriver.la -Wl,-zmuldefs $(LDFLAGS) $(LINBOX_LDFLAGS) + + pkginclude_HEADERS =lb-maple.h lb-maple-utilities.h + +diff -ru a/interfaces/maple/Makefile.in b/interfaces/maple/Makefile.in +--- a/interfaces/maple/Makefile.in 2017-02-06 17:34:39.703924800 +0100 ++++ b/interfaces/maple/Makefile.in 2017-02-06 17:49:25.536153500 +0100 +@@ -296,6 +296,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -406,7 +407,7 @@ + @LINBOX_HAVE_MAPLE_TRUE@AM_CXXFLAGS = @DEFAULT_CFLAGS@ -DDISABLE_COMMENTATOR -I../driver $(NTL_CFLAGS) $(MAPLE_CFLAGS) + @LINBOX_HAVE_MAPLE_TRUE@lib_LTLIBRARIES = liblbmaple.la + @LINBOX_HAVE_MAPLE_TRUE@liblbmaple_la_SOURCES = lb-maple.C +-@LINBOX_HAVE_MAPLE_TRUE@liblbmaple_la_LDFLAGS = $(NTL_LIBS) $(MAPLE_LIBS) $(top_srcdir)/interfaces/driver/liblbdriver.la -Wl,-zmuldefs $(LDFLAGS) ++@LINBOX_HAVE_MAPLE_TRUE@liblbmaple_la_LDFLAGS = $(NTL_LIBS) $(MAPLE_LIBS) $(top_srcdir)/interfaces/driver/liblbdriver.la -Wl,-zmuldefs $(LDFLAGS) $(LINBOX_LDFLAGS) + @LINBOX_HAVE_MAPLE_TRUE@pkginclude_HEADERS = lb-maple.h lb-maple-utilities.h + all: all-am + +diff -ru a/interfaces/sage/Makefile.am b/interfaces/sage/Makefile.am +--- a/interfaces/sage/Makefile.am 2017-02-06 17:34:39.685920400 +0100 ++++ b/interfaces/sage/Makefile.am 2017-02-06 17:48:31.691793800 +0100 +@@ -38,5 +38,5 @@ + #gentoo's linbox-1.1.6-fix-undefined-symbols.patch + liblinboxsage_la_LIBADD = $(top_builddir)/linbox/liblinbox.la + +-liblinboxsage_la_LDFLAGS = $(DEPS_LIBS) $(LDFLAGS) -version-info 0:0:0 #-Wl,-zmuldefs ++liblinboxsage_la_LDFLAGS = $(DEPS_LIBS) $(LDFLAGS) $(LINBOX_LDFLAGS) -version-info 0:0:0 #-Wl,-zmuldefs + endif +diff -ru a/interfaces/sage/Makefile.in b/interfaces/sage/Makefile.in +--- a/interfaces/sage/Makefile.in 2017-02-06 17:34:39.676920200 +0100 ++++ b/interfaces/sage/Makefile.in 2017-02-06 17:49:25.576653400 +0100 +@@ -297,6 +297,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -415,7 +416,7 @@ + #liblinboxsage_la_LIBADD = -llinbox + #gentoo's linbox-1.1.6-fix-undefined-symbols.patch + @LINBOX_HAVE_SAGE_TRUE@liblinboxsage_la_LIBADD = $(top_builddir)/linbox/liblinbox.la +-@LINBOX_HAVE_SAGE_TRUE@liblinboxsage_la_LDFLAGS = $(DEPS_LIBS) $(LDFLAGS) -version-info 0:0:0 #-Wl,-zmuldefs ++@LINBOX_HAVE_SAGE_TRUE@liblinboxsage_la_LDFLAGS = $(DEPS_LIBS) $(LDFLAGS) $(LINBOX_LDFLAGS) -version-info 0:0:0 #-Wl,-zmuldefs + all: all-am + + .SUFFIXES: +diff -ru a/linbox/algorithms/gauss/Makefile.in b/linbox/algorithms/gauss/Makefile.in +--- a/linbox/algorithms/gauss/Makefile.in 2017-02-06 17:34:40.811512900 +0100 ++++ b/linbox/algorithms/gauss/Makefile.in 2017-02-06 17:49:25.699269100 +0100 +@@ -261,6 +261,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/linbox/algorithms/Makefile.in b/linbox/algorithms/Makefile.in +--- a/linbox/algorithms/Makefile.in 2017-02-06 17:34:40.892012600 +0100 ++++ b/linbox/algorithms/Makefile.in 2017-02-06 17:49:25.662769500 +0100 +@@ -331,6 +331,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/linbox/algorithms/matrix-blas3/Makefile.in b/linbox/algorithms/matrix-blas3/Makefile.in +--- a/linbox/algorithms/matrix-blas3/Makefile.in 2017-02-06 17:34:41.334550500 +0100 ++++ b/linbox/algorithms/matrix-blas3/Makefile.in 2017-02-06 17:49:25.736269000 +0100 +@@ -262,6 +262,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/linbox/algorithms/opencl-kernels/Makefile.in b/linbox/algorithms/opencl-kernels/Makefile.in +--- a/linbox/algorithms/opencl-kernels/Makefile.in 2017-02-06 17:34:41.048032700 +0100 ++++ b/linbox/algorithms/opencl-kernels/Makefile.in 2017-02-06 17:49:25.772269700 +0100 +@@ -262,6 +262,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/linbox/algorithms/polynomial-matrix/Makefile.in b/linbox/algorithms/polynomial-matrix/Makefile.in +--- a/linbox/algorithms/polynomial-matrix/Makefile.in 2017-02-06 17:34:41.118038400 +0100 ++++ b/linbox/algorithms/polynomial-matrix/Makefile.in 2017-02-06 17:49:25.808769600 +0100 +@@ -261,6 +261,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/linbox/blackbox/Makefile.in b/linbox/blackbox/Makefile.in +--- a/linbox/blackbox/Makefile.in 2017-02-06 17:34:40.342490600 +0100 ++++ b/linbox/blackbox/Makefile.in 2017-02-06 17:49:25.847769500 +0100 +@@ -274,6 +274,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/linbox/element/Makefile.in b/linbox/element/Makefile.in +--- a/linbox/element/Makefile.in 2017-02-06 17:34:40.189476400 +0100 ++++ b/linbox/element/Makefile.in 2017-02-06 17:49:25.884331300 +0100 +@@ -242,6 +242,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/linbox/field/Makefile.in b/linbox/field/Makefile.in +--- a/linbox/field/Makefile.in 2017-02-06 17:34:40.238976000 +0100 ++++ b/linbox/field/Makefile.in 2017-02-06 17:49:25.920830500 +0100 +@@ -261,6 +261,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/linbox/Makefile.in b/linbox/Makefile.in +--- a/linbox/Makefile.in 2017-02-06 17:34:41.938142500 +0100 ++++ b/linbox/Makefile.in 2017-02-06 17:49:25.619769700 +0100 +@@ -339,6 +339,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/linbox/matrix/densematrix/Makefile.in b/linbox/matrix/densematrix/Makefile.in +--- a/linbox/matrix/densematrix/Makefile.in 2017-02-06 17:34:41.579592400 +0100 ++++ b/linbox/matrix/densematrix/Makefile.in 2017-02-06 17:49:25.998331800 +0100 +@@ -262,6 +262,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/linbox/matrix/Makefile.in b/linbox/matrix/Makefile.in +--- a/linbox/matrix/Makefile.in 2017-02-06 17:34:41.657100600 +0100 ++++ b/linbox/matrix/Makefile.in 2017-02-06 17:49:25.960845400 +0100 +@@ -303,6 +303,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/linbox/matrix/matrixdomain/Makefile.in b/linbox/matrix/matrixdomain/Makefile.in +--- a/linbox/matrix/matrixdomain/Makefile.in 2017-02-06 17:34:41.525072000 +0100 ++++ b/linbox/matrix/matrixdomain/Makefile.in 2017-02-06 17:49:26.037330200 +0100 +@@ -262,6 +262,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/linbox/matrix/sliced3/Makefile.in b/linbox/matrix/sliced3/Makefile.in +--- a/linbox/matrix/sliced3/Makefile.in 2017-02-06 17:34:41.619106200 +0100 ++++ b/linbox/matrix/sliced3/Makefile.in 2017-02-06 17:49:26.075331500 +0100 +@@ -261,6 +261,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/linbox/matrix/sparsematrix/Makefile.in b/linbox/matrix/sparsematrix/Makefile.in +--- a/linbox/matrix/sparsematrix/Makefile.in 2017-02-06 17:34:41.408051100 +0100 ++++ b/linbox/matrix/sparsematrix/Makefile.in 2017-02-06 17:49:26.113333300 +0100 +@@ -261,6 +261,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/linbox/randiter/Makefile.in b/linbox/randiter/Makefile.in +--- a/linbox/randiter/Makefile.in 2017-02-06 17:34:39.952933900 +0100 ++++ b/linbox/randiter/Makefile.in 2017-02-06 17:49:26.154830900 +0100 +@@ -294,6 +294,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/linbox/ring/Makefile.in b/linbox/ring/Makefile.in +--- a/linbox/ring/Makefile.in 2017-02-06 17:34:40.154486000 +0100 ++++ b/linbox/ring/Makefile.in 2017-02-06 17:49:26.194831500 +0100 +@@ -308,6 +308,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/linbox/ring/modular/Makefile.in b/linbox/ring/modular/Makefile.in +--- a/linbox/ring/modular/Makefile.in 2017-02-06 17:34:40.057431300 +0100 ++++ b/linbox/ring/modular/Makefile.in 2017-02-06 17:49:26.230845700 +0100 +@@ -261,6 +261,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/linbox/ring/ntl/Makefile.in b/linbox/ring/ntl/Makefile.in +--- a/linbox/ring/ntl/Makefile.in 2017-02-06 17:34:40.134485700 +0100 ++++ b/linbox/ring/ntl/Makefile.in 2017-02-06 17:49:26.268331000 +0100 +@@ -264,6 +264,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/linbox/solutions/Makefile.in b/linbox/solutions/Makefile.in +--- a/linbox/solutions/Makefile.in 2017-02-06 17:34:41.776617100 +0100 ++++ b/linbox/solutions/Makefile.in 2017-02-06 17:49:26.311330700 +0100 +@@ -263,6 +263,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/linbox/util/formats/Makefile.in b/linbox/util/formats/Makefile.in +--- a/linbox/util/formats/Makefile.in 2017-02-06 17:34:41.877105700 +0100 ++++ b/linbox/util/formats/Makefile.in 2017-02-06 17:49:26.387830900 +0100 +@@ -261,6 +261,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/linbox/util/Makefile.in b/linbox/util/Makefile.in +--- a/linbox/util/Makefile.in 2017-02-06 17:34:41.842107200 +0100 ++++ b/linbox/util/Makefile.in 2017-02-06 17:49:26.351831300 +0100 +@@ -336,6 +336,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/linbox/vector/Makefile.in b/linbox/vector/Makefile.in +--- a/linbox/vector/Makefile.in 2017-02-06 17:34:40.568512800 +0100 ++++ b/linbox/vector/Makefile.in 2017-02-06 17:49:26.425846200 +0100 +@@ -261,6 +261,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/macros/Makefile.in b/macros/Makefile.in +--- a/macros/Makefile.in 2017-02-06 17:34:42.161518400 +0100 ++++ b/macros/Makefile.in 2017-02-06 17:49:26.456862400 +0100 +@@ -213,6 +213,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/Makefile.in b/Makefile.in +--- a/Makefile.in 2017-02-06 17:34:39.448852700 +0100 ++++ b/Makefile.in 2017-02-06 17:49:25.129534900 +0100 +@@ -338,6 +338,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/tests/data/Makefile.in b/tests/data/Makefile.in +--- a/tests/data/Makefile.in 2017-02-06 17:34:42.305020400 +0100 ++++ b/tests/data/Makefile.in 2017-02-06 17:49:26.676899000 +0100 +@@ -212,6 +212,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/tests/Makefile.in b/tests/Makefile.in +--- a/tests/Makefile.in 2017-02-06 17:34:42.357025900 +0100 ++++ b/tests/Makefile.in 2017-02-06 17:49:26.643868200 +0100 +@@ -1260,6 +1260,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +diff -ru a/tests/matrix/Makefile.in b/tests/matrix/Makefile.in +--- a/tests/matrix/Makefile.in 2017-02-06 17:34:42.374029500 +0100 ++++ b/tests/matrix/Makefile.in 2017-02-06 17:49:26.706918800 +0100 +@@ -212,6 +212,7 @@ + LINBOXSAGE_LIBS = @LINBOXSAGE_LIBS@ + LINBOX_BENCH_PATH = @LINBOX_BENCH_PATH@ + LINBOX_DOC_PATH = @LINBOX_DOC_PATH@ ++LINBOX_LDFLAGS = @LINBOX_LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ diff --git a/build/pkgs/lrslib/checksums.ini b/build/pkgs/lrslib/checksums.ini index b126d123f27..88276625302 100644 --- a/build/pkgs/lrslib/checksums.ini +++ b/build/pkgs/lrslib/checksums.ini @@ -1,4 +1,4 @@ tarball=lrslib-VERSION.tar.gz -sha1=7d1b187abd8dbb7ff2c8d7fdf0361a4fc27bb087 -md5=17fcc81d6153caf9b1e881566fdb70c1 -cksum=1582540417 +sha1=c644600ca4a51eb08e61ba175e1d4ec999dc3e4b +md5=bb435ccdd5faf292102e246827926680 +cksum=3830123478 diff --git a/build/pkgs/lrslib/package-version.txt b/build/pkgs/lrslib/package-version.txt index 67e8cc7de0c..6ceb12bb4fd 100644 --- a/build/pkgs/lrslib/package-version.txt +++ b/build/pkgs/lrslib/package-version.txt @@ -1 +1 @@ -062+autotools-2016-09-08 +062+autotools-2017-03-03 diff --git a/build/pkgs/maxima/checksums.ini b/build/pkgs/maxima/checksums.ini index 6ea9155fed4..c442d5d2a53 100644 --- a/build/pkgs/maxima/checksums.ini +++ b/build/pkgs/maxima/checksums.ini @@ -1,4 +1,4 @@ tarball=maxima-VERSION.tar.gz -sha1=4431afec577e3cc42370fd768262cf7e1cef9f7f -md5=4bb0b999645ec2b20b7e301d36f83a4c -cksum=80051208 +sha1=c366966d740b17ff8a86c3b6019522c5f8195d34 +md5=3bccafb512ff1054be700c61601088af +cksum=743287720 diff --git a/build/pkgs/maxima/package-version.txt b/build/pkgs/maxima/package-version.txt index 85cd25266aa..f412cc58f9b 100644 --- a/build/pkgs/maxima/package-version.txt +++ b/build/pkgs/maxima/package-version.txt @@ -1 +1 @@ -5.35.1.p2 +5.39.0.p0 diff --git a/build/pkgs/maxima/patches/0001-taylor2-Avoid-blowing-the-stack-when-diff-expand-isn.patch b/build/pkgs/maxima/patches/0001-taylor2-Avoid-blowing-the-stack-when-diff-expand-isn.patch index 9a632255b57..49abbb14c1c 100644 --- a/build/pkgs/maxima/patches/0001-taylor2-Avoid-blowing-the-stack-when-diff-expand-isn.patch +++ b/build/pkgs/maxima/patches/0001-taylor2-Avoid-blowing-the-stack-when-diff-expand-isn.patch @@ -1,8 +1,8 @@ diff --git a/src/hayat.lisp b/src/hayat.lisp -index ae2c78c..4b9c547 100644 +index 07699d6..ab8984d 100644 --- a/src/hayat.lisp +++ b/src/hayat.lisp -@@ -2181,6 +2181,23 @@ +@@ -2189,6 +2189,23 @@ (or (alike1 (exp-pt (get-datum (datum-var (car l)))) (exp-pt (car l))) (return () )))) @@ -26,7 +26,7 @@ index ae2c78c..4b9c547 100644 (defun taylor2 (e) (let ((last-exp e)) ;; lexp-non0 should be bound here when needed (cond ((assolike e tlist) (var-expand e 1 () )) -@@ -2224,8 +2241,31 @@ +@@ -2232,8 +2249,31 @@ ((null l) t) (or (free e (car l)) (return ())))) (newsym e)) @@ -60,7 +60,7 @@ index ae2c78c..4b9c547 100644 (defun compatvarlist (a b c d) (cond ((null a) t) -@@ -2960,7 +3000,21 @@ +@@ -2968,7 +3008,21 @@ (and (or (member '$inf pt-list :test #'eq) (member '$minf pt-list :test #'eq)) (unfam-sing-err))) @@ -83,20 +83,3 @@ index ae2c78c..4b9c547 100644 (check-inf-sing (mapcar (function caddr) l)) (cond ((not l) exp) (t -diff --git a/tests/rtest_taylor.mac b/tests/rtest_taylor.mac -index 1b26258..d2132c7 100644 ---- a/tests/rtest_taylor.mac -+++ b/tests/rtest_taylor.mac -@@ -539,3 +539,9 @@ - + 2856700692480*x^2 + 3370143559680*x + 2386516803584)], - pade (t, 5, 5), is (equal (%%, foo))); - true; -+ -+/* Avoid blowing the stack if diff-expand doesn't return anything -+ helpful. Example comes from Bug ID: 2520 -+ */ -+errcatch(taylor (sin(x)/abs(sin(x)), x, 0, 0))$ -+[]; --- -1.7.10.4 - diff --git a/build/pkgs/maxima/patches/build-fasl.patch b/build/pkgs/maxima/patches/build-fasl.patch deleted file mode 100644 index 1afb040aeae..00000000000 --- a/build/pkgs/maxima/patches/build-fasl.patch +++ /dev/null @@ -1,23 +0,0 @@ -Build a fasl library for ecl in addition to an executable program. - -References: -* http://trac.sagemath.org/ticket/16178 -* https://github.com/cschwan/sage-on-gentoo/issues/226 -* https://bugs.gentoo.org/show_bug.cgi?id=499634 - -Index: maxima-5.29.1/src/maxima.system -=================================================================== ---- maxima-5.29.1.orig/src/maxima.system -+++ maxima-5.29.1/src/maxima.system -@@ -75,6 +75,11 @@ - ;; Convert dir/foo.fas to dir/foo.o - (make-pathname :type "o" :defaults p)) - files))) -+ (c::build-fasl "binary-ecl/maxima" :lisp-files obj -+ :ld-flags -+ (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*" -+ (find-package "MAXIMA"))))) -+ (if (and x (not (string= x ""))) (list x)))) - (c::build-program "binary-ecl/maxima" :lisp-files obj - :ld-flags - (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*" diff --git a/build/pkgs/maxima/patches/infodir.patch b/build/pkgs/maxima/patches/infodir.patch index b3bf51e6051..a4c037bb848 100644 --- a/build/pkgs/maxima/patches/infodir.patch +++ b/build/pkgs/maxima/patches/infodir.patch @@ -1,10 +1,12 @@ ---- src/src/init-cl.lisp 2010-12-05 03:06:03.000000000 +0100 -+++ src/src/init-cl.lisp 2011-05-18 19:16:05.226488803 +0200 -@@ -131,7 +131,7 @@ +diff --git a/src/init-cl.lisp b/src/init-cl.lisp +index 0e1f18b..125f449 100644 +--- a/src/init-cl.lisp ++++ b/src/init-cl.lisp +@@ -134,7 +134,7 @@ When one changes, the other does too." (setq libdir (combine-path maxima-prefix-env "lib")) (setq libexecdir (combine-path maxima-prefix-env "libexec")) (setq datadir (combine-path maxima-prefix-env "share")) -- (setq infodir (combine-path maxima-prefix-env "info"))) +- (setq infodir (combine-path maxima-prefix-env #+(or cygwin windows win32 win64) "share" "info"))) + (setq infodir (combine-path maxima-prefix-env "share" "info"))) (progn (setq libdir (maxima-parse-dirstring *autoconf-libdir*)) diff --git a/build/pkgs/maxima/patches/makeinfo.patch b/build/pkgs/maxima/patches/makeinfo.patch deleted file mode 100644 index c10ae1110ae..00000000000 --- a/build/pkgs/maxima/patches/makeinfo.patch +++ /dev/null @@ -1,25 +0,0 @@ -Use $(MAKEINFO) instead of hardcoded makeinfo to build maxima.info. -Introduced in Trac #17514 (Upgrade Maxima to 5.35.1). - ---- a/doc/info/Makefile.am -+++ b/doc/info/Makefile.am -@@ -211,7 +211,7 @@ - all-local: maxima.info maxima-index.lisp $(MAXIMA_CHM) - - maxima.info : maxima.texi -- makeinfo --split-size=1000000 maxima.texi -+ $(MAKEINFO) --split-size=1000000 maxima.texi - - html: maxima.html contents.hhc - ---- a/doc/info/Makefile.in -+++ b/doc/info/Makefile.in -@@ -1064,7 +1064,7 @@ - all-local: maxima.info maxima-index.lisp $(MAXIMA_CHM) - - maxima.info : maxima.texi -- makeinfo --split-size=1000000 maxima.texi -+ $(MAKEINFO) --split-size=1000000 maxima.texi - - html: maxima.html contents.hhc - diff --git a/build/pkgs/maxima/patches/matrixexp.patch b/build/pkgs/maxima/patches/matrixexp.patch index a9318b0c289..5c8527c33bf 100644 --- a/build/pkgs/maxima/patches/matrixexp.patch +++ b/build/pkgs/maxima/patches/matrixexp.patch @@ -1,3 +1,5 @@ +diff --git a/share/linearalgebra/matrixexp.lisp b/share/linearalgebra/matrixexp.lisp +index 218bf35..f2fd468 100644 --- a/share/linearalgebra/matrixexp.lisp +++ b/share/linearalgebra/matrixexp.lisp @@ -138,8 +138,8 @@ diff --git a/build/pkgs/maxima/patches/maxima.system.patch b/build/pkgs/maxima/patches/maxima.system.patch index b2fc28e7c12..74db62e7f9f 100644 --- a/build/pkgs/maxima/patches/maxima.system.patch +++ b/build/pkgs/maxima/patches/maxima.system.patch @@ -1,5 +1,7 @@ ---- src/src/maxima.system 2010-12-04 18:06:03.000000000 -0800 -+++ /Users/wstein/sage/install/sage-4.7.3.alpha1/spkg/build/maxima-5.23.2.p0/src/src/maxima.system 2011-10-30 23:52:09.000000000 -0700 +diff --git a/src/maxima.system b/src/maxima.system +index 76f2452..cf25f51 100644 +--- a/src/maxima.system ++++ b/src/maxima.system @@ -1,5 +1,8 @@ ;;; -*- Lisp -*- @@ -9,3 +11,15 @@ (in-package :cl-user) (pushnew :cl *features*) +@@ -75,6 +78,11 @@ + ;; Convert dir/foo.fas to dir/foo.o + (make-pathname :type "o" :defaults p)) + files))) ++ (c::build-fasl "binary-ecl/maxima" :lisp-files obj ++ :ld-flags ++ (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*" ++ (find-package "MAXIMA"))))) ++ (if (and x (not (string= x ""))) (list x)))) + (c::build-program "binary-ecl/maxima" :lisp-files obj + :ld-flags + (let ((x (symbol-value (find-symbol "*AUTOCONF-LD-FLAGS*" diff --git a/build/pkgs/maxima/patches/stdin-illegal-seek.patch b/build/pkgs/maxima/patches/stdin-illegal-seek.patch deleted file mode 100644 index 74a45aa4e31..00000000000 --- a/build/pkgs/maxima/patches/stdin-illegal-seek.patch +++ /dev/null @@ -1,32 +0,0 @@ -#17667: Maxima parser fails on == - -There is no == operator in Maxima, but on invalid input it does bad -things to the C-level stream. On Linux (below) this is caught by -gilbc, on OSX the Maxima process hangs indefinitely. - -Patch taken from the upstream repo: - -commit f7c388a0f030b2701ac982ea66cce61ce8002bf8 -tree 948ebe84ce56a76090e2b86403b18d7bc262e67c -parent a57b4323587f6f4c1115a51915cfb096f4d820c2 -author Andrej Vodopivec 1423041512 +0100 -committer Andrej Vodopivec 1423041512 +0100 - - mread-synerr: don't report line/column for errors from user input. - -diff -ru src/src/nparse.lisp b/src/nparse.lisp ---- src/src/nparse.lisp 2014-11-19 06:00:09.000000000 +0100 -+++ b/src/nparse.lisp 2015-02-13 10:12:49.107785016 +0100 -@@ -37,8 +37,10 @@ - (defmvar $report_synerr_info t "If T, report the syntax error details from all sources; otherwise, only report details from standard-input.") - - (defun mread-synerr (format-string &rest l) -- (let ((fp (file-position *parse-stream*)) -- (file (cadr *current-line-info*))) -+ (let ((fp (and (not (eq *parse-stream* *standard-input*)) -+ (file-position *parse-stream*))) -+ (file (and (not (eq *parse-stream* *standard-input*)) -+ (cadr *current-line-info*)))) - (flet ((line-number () - ;; Fix me: Neither batch nor load track the line number - ;; correctly. batch, via dbm-read, does not track the diff --git a/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch b/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch index bd1f62e5ca8..535134b01b6 100644 --- a/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch +++ b/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch @@ -1,3 +1,5 @@ +diff --git a/src/grind.lisp b/src/grind.lisp +index 4ae73a3..86b80e6 100644 --- a/src/grind.lisp +++ b/src/grind.lisp @@ -295,12 +295,12 @@ diff --git a/build/pkgs/maxima/spkg-install b/build/pkgs/maxima/spkg-install index 284534ac1f0..9473fb3acd5 100755 --- a/build/pkgs/maxima/spkg-install +++ b/build/pkgs/maxima/spkg-install @@ -42,9 +42,24 @@ cp "$SAGE_ROOT"/config/config.* . echo echo "Now configuring Maxima..." +./bootstrap ./configure --prefix="$SAGE_LOCAL" --libdir="$SAGE_LOCAL/lib" --enable-ecl git_found=false check_error "Failed to configure Maxima." +# Note the following is regression in maxima build system +# see https://sourceforge.net/p/maxima/bugs/3278/ +# and https://sourceforge.net/p/maxima/bugs/2878/ +# For the previous time it was fixed. +#--------------------------------------------------------------- +# Touching html and info file to avoid to regenerate them. +# This must be done after configuration since the timestamp need +# to be later than include-maxima.texi which is generated at +# configuration time +for i in doc/info/*.html ; do + touch "${i}" +done +touch doc/info/maxima.info* +#--------------------------------------------------------------- echo echo "Now building Maxima..." diff --git a/build/pkgs/modular_decomposition/type b/build/pkgs/modular_decomposition/type index 134d9bc32d5..9839eb20815 100644 --- a/build/pkgs/modular_decomposition/type +++ b/build/pkgs/modular_decomposition/type @@ -1 +1 @@ -optional +experimental diff --git a/build/pkgs/mpir/package-version.txt b/build/pkgs/mpir/package-version.txt index 37c2961c243..7efaac305e2 100644 --- a/build/pkgs/mpir/package-version.txt +++ b/build/pkgs/mpir/package-version.txt @@ -1 +1 @@ -2.7.2 +2.7.2.p0 diff --git a/build/pkgs/mpir/patches/PR185.patch b/build/pkgs/mpir/patches/PR185.patch new file mode 100644 index 00000000000..398200e66c3 --- /dev/null +++ b/build/pkgs/mpir/patches/PR185.patch @@ -0,0 +1,39 @@ +From fdb590023f7ca4b2e881a2e9573718e7ed180f03 Mon Sep 17 00:00:00 2001 +From: Tommy Hofmann +Date: Fri, 13 Jan 2017 08:30:56 +0100 +Subject: [PATCH] Adjust to new sed version + +Change [:space] to [[:space]]. +sed requires character classes to be inside square brackets. +As of sed 4.3, missing the brackets raises an error. +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 4d010b7..9faebcd 100755 +--- a/configure ++++ b/configure +@@ -24301,7 +24301,7 @@ esac + sed -n 's/^[ ]*MULFUNC_PROLOGUE(\(.*\))/\1/p' $tmp_file ; + sed -n 's/^[ ]*PROLOGUE(\([^,]*\).*)/\1/p' $tmp_file ; + sed -n 's/^;[ ]*PROLOGUE(\([^,]*\).*)/\1/p' $tmp_file ; +- sed -n 's/[^G]*GLOBAL_FUNC[:space:]*\(.*\)/\1/p' $tmp_file ; ++ sed -n 's/[^G]*GLOBAL_FUNC[[:space:]]*\(.*\)/\1/p' $tmp_file ; + ` + for gmp_tmp in $gmp_ep; do + cat >>confdefs.h <<_ACEOF +diff --git a/configure.ac b/configure.ac +index bde9f09..170b9e4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2595,7 +2595,7 @@ for tmp_fn in $gmp_mpn_functions; do + sed -n 's/^[ ]*MULFUNC_PROLOGUE(\(.*\))/\1/p' $tmp_file ; + sed -n 's/^[ ]*PROLOGUE(\([^,]*\).*)/\1/p' $tmp_file ; + sed -n 's/^;[ ]*PROLOGUE(\([^,]*\).*)/\1/p' $tmp_file ; +- sed -n 's/[^G]*GLOBAL_FUNC[:space:]*\(.*\)/\1/p' $tmp_file ; ++ sed -n 's/[^G]*GLOBAL_FUNC[[:space:]]*\(.*\)/\1/p' $tmp_file ; + `] + for gmp_tmp in $gmp_ep; do + AC_DEFINE_UNQUOTED(HAVE_NATIVE_$gmp_tmp) diff --git a/build/pkgs/mpmath/SPKG.txt b/build/pkgs/mpmath/SPKG.txt index e885c18929d..e6d841c6097 100644 --- a/build/pkgs/mpmath/SPKG.txt +++ b/build/pkgs/mpmath/SPKG.txt @@ -8,7 +8,7 @@ Mpmath is a pure-Python library for multiprecision floating-point arithmetic. It * Author: Fredrik Johansson * Email: fredrik.johansson@gmail.com - * Website: http://code.google.com/p/mpmath/ + * Website: https://github.com/fredrik-johansson/mpmath/ == Dependencies == diff --git a/build/pkgs/nbformat/checksums.ini b/build/pkgs/nbformat/checksums.ini index fec20b2e779..aecd4faf4d5 100644 --- a/build/pkgs/nbformat/checksums.ini +++ b/build/pkgs/nbformat/checksums.ini @@ -1,4 +1,4 @@ tarball=nbformat-VERSION.tar.gz -sha1=c823d95938cb12b8e8af918bd2e547d3ca966e4f -md5=684c4dc3c6fd8036fd1ae1c908003e23 -cksum=3054783982 +sha1=96c8836cc2ef1457b150d61bb7f20cdcab64d66c +md5=f90f24d317b651226a6b547fa69d8da4 +cksum=159106855 diff --git a/build/pkgs/nbformat/package-version.txt b/build/pkgs/nbformat/package-version.txt index f727dc16efb..6aba2b245a8 100644 --- a/build/pkgs/nbformat/package-version.txt +++ b/build/pkgs/nbformat/package-version.txt @@ -1 +1 @@ -4.0.1.p0 +4.2.0 diff --git a/build/pkgs/ncurses/SPKG.txt b/build/pkgs/ncurses/SPKG.txt index 74eb9bb759d..9b8f450a1c7 100644 --- a/build/pkgs/ncurses/SPKG.txt +++ b/build/pkgs/ncurses/SPKG.txt @@ -38,8 +38,4 @@ None == Special Update/Build Instructions == -=== Patches === - - * xopen_source.patch: remove harmful check from aclocal.m4 which may - reintroduce XOPEN_SOURCE on systems where it should not be used. - +None diff --git a/build/pkgs/ncurses/checksums.ini b/build/pkgs/ncurses/checksums.ini index 24699f0ab9f..27620e7d25a 100644 --- a/build/pkgs/ncurses/checksums.ini +++ b/build/pkgs/ncurses/checksums.ini @@ -1,4 +1,4 @@ -tarball=ncurses-VERSION.tar.bz2 -sha1=c9e9e398a9bcfeb1cc005c4d3eac0998f3445ff2 -md5=b2996284ae18610aa2a4e5a968c5e1f3 -cksum=3072370532 +tarball=ncurses-VERSION.tar.gz +sha1=acd606135a5124905da770803c05f1f20dd3b21c +md5=ee13d052e1ead260d7c28071f46eefb1 +cksum=1470804880 diff --git a/build/pkgs/ncurses/package-version.txt b/build/pkgs/ncurses/package-version.txt index a2a77b0243f..e0ea36feef6 100644 --- a/build/pkgs/ncurses/package-version.txt +++ b/build/pkgs/ncurses/package-version.txt @@ -1 +1 @@ -5.9.20131221 +6.0 diff --git a/build/pkgs/ncurses/patches/xopen_source.patch b/build/pkgs/ncurses/patches/xopen_source.patch deleted file mode 100644 index cbb128b4bab..00000000000 --- a/build/pkgs/ncurses/patches/xopen_source.patch +++ /dev/null @@ -1,313 +0,0 @@ -diff -druN ncurses-5.9.20131221.orig/aclocal.m4 ncurses-5.9.20131221/aclocal.m4 ---- ncurses-5.9.20131221.orig/aclocal.m4 2013-11-23 10:20:50.000000000 -0800 -+++ ncurses-5.9.20131221/aclocal.m4 2014-02-07 06:00:43.277597929 -0800 -@@ -7198,32 +7198,3 @@ - CF_ADD_CFLAGS($cf_xopen_source) - fi - --dnl In anything but the default case, we may have system-specific setting --dnl which is still not guaranteed to provide all of the entrypoints that --dnl _XOPEN_SOURCE would yield. --if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then -- AC_MSG_CHECKING(if _XOPEN_SOURCE really is set) -- AC_TRY_COMPILE([#include ],[ --#ifndef _XOPEN_SOURCE --make an error --#endif], -- [cf_XOPEN_SOURCE_set=yes], -- [cf_XOPEN_SOURCE_set=no]) -- AC_MSG_RESULT($cf_XOPEN_SOURCE_set) -- if test $cf_XOPEN_SOURCE_set = yes -- then -- AC_TRY_COMPILE([#include ],[ --#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE --make an error --#endif], -- [cf_XOPEN_SOURCE_set_ok=yes], -- [cf_XOPEN_SOURCE_set_ok=no]) -- if test $cf_XOPEN_SOURCE_set_ok = no -- then -- AC_MSG_WARN(_XOPEN_SOURCE is lower than requested) -- fi -- else -- CF_TRY_XOPEN_SOURCE -- fi --fi --]) -diff -druN ncurses-5.9.20131221.orig/configure ncurses-5.9.20131221/configure ---- ncurses-5.9.20131221.orig/configure 2013-12-14 16:44:11.000000000 -0800 -+++ ncurses-5.9.20131221/configure 2014-02-07 06:01:25.747602176 -0800 -@@ -8119,273 +8119,6 @@ - - fi - --if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then -- echo "$as_me:8123: checking if _XOPEN_SOURCE really is set" >&5 --echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 -- cat >conftest.$ac_ext <<_ACEOF --#line 8126 "configure" --#include "confdefs.h" --#include --int --main () --{ -- --#ifndef _XOPEN_SOURCE --make an error --#endif -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:8141: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:8144: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8147: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:8150: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- cf_XOPEN_SOURCE_set=yes --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --cf_XOPEN_SOURCE_set=no --fi --rm -f conftest.$ac_objext conftest.$ac_ext -- echo "$as_me:8159: result: $cf_XOPEN_SOURCE_set" >&5 --echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 -- if test $cf_XOPEN_SOURCE_set = yes -- then -- cat >conftest.$ac_ext <<_ACEOF --#line 8164 "configure" --#include "confdefs.h" --#include --int --main () --{ -- --#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE --make an error --#endif -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:8179: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:8182: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8185: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:8188: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- cf_XOPEN_SOURCE_set_ok=yes --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --cf_XOPEN_SOURCE_set_ok=no --fi --rm -f conftest.$ac_objext conftest.$ac_ext -- if test $cf_XOPEN_SOURCE_set_ok = no -- then -- { echo "$as_me:8199: WARNING: _XOPEN_SOURCE is lower than requested" >&5 --echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} -- fi -- else -- --echo "$as_me:8204: checking if we should define _XOPEN_SOURCE" >&5 --echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 --if test "${cf_cv_xopen_source+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- -- cat >conftest.$ac_ext <<_ACEOF --#line 8211 "configure" --#include "confdefs.h" -- --#include --#include --#include -- --int --main () --{ -- --#ifndef _XOPEN_SOURCE --make an error --#endif -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:8230: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:8233: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8236: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:8239: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- cf_cv_xopen_source=no --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --cf_save="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" -- cat >conftest.$ac_ext <<_ACEOF --#line 8248 "configure" --#include "confdefs.h" -- --#include --#include --#include -- --int --main () --{ -- --#ifdef _XOPEN_SOURCE --make an error --#endif -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:8267: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:8270: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8273: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:8276: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- cf_cv_xopen_source=no --else -- echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --cf_cv_xopen_source=$cf_XOPEN_SOURCE --fi --rm -f conftest.$ac_objext conftest.$ac_ext -- CPPFLAGS="$cf_save" -- --fi --rm -f conftest.$ac_objext conftest.$ac_ext -- --fi --echo "$as_me:8291: result: $cf_cv_xopen_source" >&5 --echo "${ECHO_T}$cf_cv_xopen_source" >&6 -- --if test "$cf_cv_xopen_source" != no ; then -- --CFLAGS=`echo "$CFLAGS" | \ -- sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -- -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` -- --CPPFLAGS=`echo "$CPPFLAGS" | \ -- sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -- -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` -- -- cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" -- --cf_fix_cppflags=no --cf_new_cflags= --cf_new_cppflags= --cf_new_extra_cppflags= -- --for cf_add_cflags in $cf_temp_xopen_source --do --case $cf_fix_cppflags in --no) -- case $cf_add_cflags in #(vi -- -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi -- case $cf_add_cflags in -- -D*) -- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` -- -- test "${cf_add_cflags}" != "${cf_tst_cflags}" \ -- && test -z "${cf_tst_cflags}" \ -- && cf_fix_cppflags=yes -- -- if test $cf_fix_cppflags = yes ; then -- cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" -- continue -- elif test "${cf_tst_cflags}" = "\"'" ; then -- cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" -- continue -- fi -- ;; -- esac -- case "$CPPFLAGS" in -- *$cf_add_cflags) #(vi -- ;; -- *) #(vi -- case $cf_add_cflags in #(vi -- -D*) -- cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` -- --CPPFLAGS=`echo "$CPPFLAGS" | \ -- sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ -- -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` -- -- ;; -- esac -- cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" -- ;; -- esac -- ;; -- *) -- cf_new_cflags="$cf_new_cflags $cf_add_cflags" -- ;; -- esac -- ;; --yes) -- cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" -- -- cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` -- -- test "${cf_add_cflags}" != "${cf_tst_cflags}" \ -- && test -z "${cf_tst_cflags}" \ -- && cf_fix_cppflags=no -- ;; --esac --done -- --if test -n "$cf_new_cflags" ; then -- -- CFLAGS="$CFLAGS $cf_new_cflags" --fi -- --if test -n "$cf_new_cppflags" ; then -- -- CPPFLAGS="$CPPFLAGS $cf_new_cppflags" --fi -- --if test -n "$cf_new_extra_cppflags" ; then -- -- EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" --fi -- --fi -- -- fi --fi -- - # Work around breakage on OS X - - echo "$as_me:8391: checking if SIGWINCH is defined" >&5 diff --git a/build/pkgs/notebook/checksums.ini b/build/pkgs/notebook/checksums.ini index c0e19e9e103..0e371266550 100644 --- a/build/pkgs/notebook/checksums.ini +++ b/build/pkgs/notebook/checksums.ini @@ -1,4 +1,4 @@ tarball=notebook-VERSION.tar.gz -sha1=cec36e2d1aa7835f2b4dda7dde8455d33a06361a -md5=09e727ba598ab1848327d211fd2ad057 -cksum=2780054946 +sha1=39183995290b59a3fc30af77cbe2b3be19de6390 +md5=3f9074031258de895f12102379394dcd +cksum=2923119232 diff --git a/build/pkgs/notebook/jupyter_notebook_config.py b/build/pkgs/notebook/jupyter_notebook_config.py index 99c7801b76c..1b0566a32ac 100644 --- a/build/pkgs/notebook/jupyter_notebook_config.py +++ b/build/pkgs/notebook/jupyter_notebook_config.py @@ -5,3 +5,9 @@ # installs mathjax. c.NotebookApp.mathjax_url = 'nbextensions/mathjax/MathJax.js' + +# Disable XSRF checking to fix Thebe. See +# * https://trac.sagemath.org/ticket/22458 +# * https://github.com/oreillymedia/thebe/issues/93 + +c.NotebookApp.disable_check_xsrf = True diff --git a/build/pkgs/notebook/package-version.txt b/build/pkgs/notebook/package-version.txt index 72869a443ca..b4813876e02 100644 --- a/build/pkgs/notebook/package-version.txt +++ b/build/pkgs/notebook/package-version.txt @@ -1 +1 @@ -4.2.1.p0 +4.4.1.p0 diff --git a/build/pkgs/numpy/spkg-install b/build/pkgs/numpy/spkg-install index de858800332..1082a08f03f 100755 --- a/build/pkgs/numpy/spkg-install +++ b/build/pkgs/numpy/spkg-install @@ -49,7 +49,9 @@ rm -rf "$SAGE_LOCAL/lib/python/site-packages/numpy" # Program around a bug in SciPY's distutils. unset CFLAGS -python setup.py install \ +python setup.py \ + --no-user-cfg \ + install \ --single-version-externally-managed \ --record /dev/null \ ${NUMPY_FCONFIG} diff --git a/build/pkgs/openblas/package-version.txt b/build/pkgs/openblas/package-version.txt index 6bf5ecb6051..e8f54044a28 100644 --- a/build/pkgs/openblas/package-version.txt +++ b/build/pkgs/openblas/package-version.txt @@ -1 +1 @@ -0.2.19 +0.2.19.p0 diff --git a/build/pkgs/openblas/patches/openblas-0.2.19-MAKE.patch b/build/pkgs/openblas/patches/openblas-0.2.19-MAKE.patch new file mode 100644 index 00000000000..c77dd0f93d1 --- /dev/null +++ b/build/pkgs/openblas/patches/openblas-0.2.19-MAKE.patch @@ -0,0 +1,29 @@ +diff --git a/Makefile b/Makefile +index 2ae0047..2071e10 100644 +--- a/Makefile ++++ b/Makefile +@@ -278,13 +278,13 @@ lapack-timing : large.tgz timing.tgz + ifndef NOFORTRAN + (cd $(NETLIB_LAPACK_DIR); $(TAR) zxf ../timing.tgz TIMING) + (cd $(NETLIB_LAPACK_DIR)/TIMING; $(TAR) zxf ../../large.tgz ) +- make -C $(NETLIB_LAPACK_DIR)/TIMING ++ $(MAKE) -C $(NETLIB_LAPACK_DIR)/TIMING + endif + + + lapack-test : + (cd $(NETLIB_LAPACK_DIR)/TESTING && rm -f x* *.out) +- make -j 1 -C $(NETLIB_LAPACK_DIR)/TESTING xeigtstc xeigtstd xeigtsts xeigtstz xlintstc xlintstd xlintstds xlintstrfd xlintstrfz xlintsts xlintstz xlintstzc xlintstrfs xlintstrfc ++ $(MAKE) -j 1 -C $(NETLIB_LAPACK_DIR)/TESTING xeigtstc xeigtstd xeigtsts xeigtstz xlintstc xlintstd xlintstds xlintstrfd xlintstrfz xlintsts xlintstz xlintstzc xlintstrfs xlintstrfc + ifneq ($(CROSS), 1) + ( cd $(NETLIB_LAPACK_DIR)/INSTALL; ./testlsame; ./testslamch; ./testdlamch; \ + ./testsecond; ./testdsecnd; ./testieee; ./testversion ) +@@ -299,7 +299,7 @@ lapack-runtest: + + blas-test: + (cd $(NETLIB_LAPACK_DIR)/BLAS && rm -f x* *.out) +- make -j 1 -C $(NETLIB_LAPACK_DIR) blas_testing ++ $(MAKE) -j 1 -C $(NETLIB_LAPACK_DIR) blas_testing + (cd $(NETLIB_LAPACK_DIR)/BLAS && cat *.out) + + diff --git a/build/pkgs/openblas/patches/openblas-0.2.19-OSX_DEPLOY.patch b/build/pkgs/openblas/patches/openblas-0.2.19-OSX_DEPLOY.patch new file mode 100644 index 00000000000..baf06297ff6 --- /dev/null +++ b/build/pkgs/openblas/patches/openblas-0.2.19-OSX_DEPLOY.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile.system b/Makefile.system +index b05177b..d4b3709 100644 +--- a/Makefile.system ++++ b/Makefile.system +@@ -217,7 +217,9 @@ endif + # + + ifeq ($(OSNAME), Darwin) ++ifndef MACOSX_DEPLOYMENT_TARGET + export MACOSX_DEPLOYMENT_TARGET=10.6 ++endif + MD5SUM = md5 -r + endif + diff --git a/build/pkgs/openblas/patches/openblas-0.2.19-SMP_conditional.patch b/build/pkgs/openblas/patches/openblas-0.2.19-SMP_conditional.patch new file mode 100644 index 00000000000..05a780ca8de --- /dev/null +++ b/build/pkgs/openblas/patches/openblas-0.2.19-SMP_conditional.patch @@ -0,0 +1,50 @@ +From c6623a8da5f9ff393008876455dfba70c1de1e3f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fran=C3=A7ois=20Bissey?= +Date: Thu, 15 Dec 2016 15:16:46 +1300 +Subject: [PATCH] More prudent handling of SMP in Makefile.system. It may need + to extended to other makefiles. + +--- + Makefile.system | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.system b/Makefile.system +index b05177b..f9c5995 100644 +--- a/Makefile.system ++++ b/Makefile.system +@@ -297,7 +297,7 @@ ifneq ($(OSNAME), WINNT) + ifneq ($(OSNAME), CYGWIN_NT) + ifneq ($(OSNAME), Interix) + ifneq ($(OSNAME), Android) +-ifdef SMP ++ifeq ($(SMP), 1) + EXTRALIB += -lpthread + endif + endif +@@ -843,7 +843,7 @@ ifeq ($(NO_AVX2), 1) + CCOMMON_OPT += -DNO_AVX2 + endif + +-ifdef SMP ++ifeq ($(SMP), 1) + CCOMMON_OPT += -DSMP_SERVER + + ifeq ($(ARCH), mips64) +@@ -1044,7 +1044,7 @@ LIBSUFFIX = a + endif + + ifneq ($(DYNAMIC_ARCH), 1) +-ifndef SMP ++ifneq ($(SMP), 1) + LIBNAME = $(LIBPREFIX)_$(LIBCORE)$(REVISION).$(LIBSUFFIX) + LIBNAME_P = $(LIBPREFIX)_$(LIBCORE)$(REVISION)_p.$(LIBSUFFIX) + else +@@ -1052,7 +1052,7 @@ LIBNAME = $(LIBPREFIX)_$(LIBCORE)p$(REVISION).$(LIBSUFFIX) + LIBNAME_P = $(LIBPREFIX)_$(LIBCORE)p$(REVISION)_p.$(LIBSUFFIX) + endif + else +-ifndef SMP ++ifneq ($(SMP), 1) + LIBNAME = $(LIBPREFIX)$(REVISION).$(LIBSUFFIX) + LIBNAME_P = $(LIBPREFIX)$(REVISION)_p.$(LIBSUFFIX) + else diff --git a/build/pkgs/openblas/spkg-check b/build/pkgs/openblas/spkg-check index 76842a845c1..d255b4c6b5c 100755 --- a/build/pkgs/openblas/spkg-check +++ b/build/pkgs/openblas/spkg-check @@ -15,6 +15,9 @@ cd src # We could also patch the Makefile to use a generic symlink pointing # to the archive with a specific name +# See #22021 for issues with multithreading +OPENBLAS_CONFIGURE="$OPENBLAS_CONFIGURE USE_THREAD=0" + if [ `python -c "from __future__ import print_function; import platform; print(platform.architecture()[0])"` = "32bit" ]; then OPENBLAS_CONFIGURE="$OPENBLAS_CONFIGURE BINARY=32" fi diff --git a/build/pkgs/openblas/spkg-install b/build/pkgs/openblas/spkg-install index 7d2550b06b7..c50fb8f7877 100755 --- a/build/pkgs/openblas/spkg-install +++ b/build/pkgs/openblas/spkg-install @@ -8,6 +8,9 @@ fi cd src +# See #22021 for issues with multithreading +OPENBLAS_CONFIGURE="$OPENBLAS_CONFIGURE USE_THREAD=0" + # OpenBLAS does not build on 32bit Haswell. Upstream suggests to pass BINARY=32 to default to NEHALEM kernels # See https://github.com/xianyi/OpenBLAS/issues/657 # Right now this affect all 32bit CPUs. @@ -27,7 +30,7 @@ fi echo "Building OpenBLAS: $MAKE $OPENBLAS_CONFIGURE" -$MAKE $OPENBLAS_CONFIGURE +$MAKE libs netlib shared $OPENBLAS_CONFIGURE if [ $? -ne 0 ]; then echo >&2 "Error building OpenBLAS" exit 1 diff --git a/build/pkgs/pari/checksums.ini b/build/pkgs/pari/checksums.ini index 19999aceb9c..7c0fe7ba182 100644 --- a/build/pkgs/pari/checksums.ini +++ b/build/pkgs/pari/checksums.ini @@ -1,4 +1,4 @@ tarball=pari-VERSION.tar.gz -sha1=efd1eb6b8d87066b2b9f3b2c38ecb30bbfdb48d2 -md5=f3f3342913a3b3b306970b3462f4d47d -cksum=1553747906 +sha1=ad6af366153ae160aaa4cb49edf3a32a69f7afc1 +md5=f997d6b526df6cd9145af0de5b822bf4 +cksum=2625551585 diff --git a/build/pkgs/pari/package-version.txt b/build/pkgs/pari/package-version.txt index 0f1e06c6502..c457e4ff002 100644 --- a/build/pkgs/pari/package-version.txt +++ b/build/pkgs/pari/package-version.txt @@ -1 +1 @@ -2.8.0.alpha.p2 +2.9.1.p2 diff --git a/build/pkgs/pari/patches/README.txt b/build/pkgs/pari/patches/README.txt index 1f213ad4280..c9b7fa89801 100644 --- a/build/pkgs/pari/patches/README.txt +++ b/build/pkgs/pari/patches/README.txt @@ -3,9 +3,6 @@ Current patches to PARI in Sage: ====================================================================== Patches to configuration files: -* get_config_options.patch (Leif Leonhardy): Catch invalid arguments to - "--graphic" (and treat such as an error) since otherwise strange - compilation errors might occur (cf. #9722, too). * get_dlcflags.patch (Jeroen Demeyer): Add -fno-common to DLCFLAGS on Darwin. Submitted upstream, but upstream only applied it for PowerPC. Since this doesn't break anything and only improves performance, add @@ -14,8 +11,3 @@ Patches to configuration files: C files: * stackwarn.patch (Jeroen Demeyer, #19883): do not display warnings regarding the stack size (unless DEBUGMEM is set). - -Building documentation -* perl_inc.patch (Francois Bissey, #21622): import upstream patch -to deal with perl install where "." is not part of @INC anymore -in perl. diff --git a/build/pkgs/pari/patches/config_graphic.patch b/build/pkgs/pari/patches/config_graphic.patch new file mode 100644 index 00000000000..66881e37a6b --- /dev/null +++ b/build/pkgs/pari/patches/config_graphic.patch @@ -0,0 +1,47 @@ +commit d02e043959bd90e7354e7675633abb8de5f27857 +Author: Jeroen Demeyer +Date: Mon Jan 9 16:06:02 2017 +0100 + + Simplify handling of --graphic option and check validity + +diff --git a/config/Makefile.SH b/config/Makefile.SH +index def1a9c..bba22ff 100644 +--- a/config/Makefile.SH ++++ b/config/Makefile.SH +@@ -69,6 +69,7 @@ esac + PLOTCFLAGS= + PLOTLIBS= + postconfig=: ++plotrunpath= + case "$which_graphic_lib" in + none) + graph=plotnull;; +@@ -90,20 +91,18 @@ fltk) + win32) + PLOTLIBS="-lgdi32" + graph=plotWin32;; ++X11) ++ PLOTCFLAGS="$PLOTCFLAGS $X11_INC" ++ PLOTLIBS="$PLOTLIBS $X11_LIBS" ++ plotrunpath=$X11 ++ graph=plotX;; ++*) ++ echo >&2 "### Unrecognized graphic library '$which_graphic_lib'." ++ exit 1;; + esac + graph="plotport $graph" + libgraph="plottty" + +-plotrunpath= +-case "$which_graphic_lib" in +- *X11*) +- PLOTCFLAGS="$PLOTCFLAGS $X11_INC" +- PLOTLIBS="$PLOTLIBS $X11_LIBS" +- plotrunpath=$X11 +- graph="plotX $graph" +- ;; +-esac +- + KERNOBJS= + for f in $kernel; do + KERNOBJS="$KERNOBJS $f\$(_O)" diff --git a/build/pkgs/pari/patches/dilog_prec.patch b/build/pkgs/pari/patches/dilog_prec.patch new file mode 100644 index 00000000000..3c588f5a5ed --- /dev/null +++ b/build/pkgs/pari/patches/dilog_prec.patch @@ -0,0 +1,20 @@ +commit 8a3e9d2babeec411a46c6454d8b2406b267f3380 +Author: Karim Belabas +Date: Mon Feb 13 09:18:43 2017 +0100 + + 41- polylog(x) used realprecision accuracy instead of precision(x) [#1895] + +diff --git a/src/basemath/trans3.c b/src/basemath/trans3.c +index 33ba45f..6202688 100644 +--- a/src/basemath/trans3.c ++++ b/src/basemath/trans3.c +@@ -2385,7 +2385,8 @@ polylog(long m, GEN x, long prec) + return gerepileupto(av, gneg(glog(gsub(gen_1,x), prec))); + } + +- l = precision(x); if (!l) l = prec; ++ l = precision(x); ++ if (!l) l = prec; else prec = l; + res = cgetc(l); av = avma; + x = gtofp(x, l+EXTRAPRECWORD); + e = gexpo(gnorm(x)); diff --git a/build/pkgs/pari/patches/fix_constants.patch b/build/pkgs/pari/patches/fix_constants.patch deleted file mode 100644 index 87585ce9ffb..00000000000 --- a/build/pkgs/pari/patches/fix_constants.patch +++ /dev/null @@ -1,51 +0,0 @@ -commit e2ce19fb6c4313396be8232eac0b627f835f1785 -Author: Karim Belabas -Date: Tue Oct 4 17:42:11 2016 +0200 - - JD 26- fix is_universal_constant() - - made (possibly wrong) assumptions about memory layout (gen_0 < ghalf) - -diff --git a/src/language/init.c b/src/language/init.c -index 68f8b56..0f8914a 100644 ---- a/src/language/init.c -+++ b/src/language/init.c -@@ -61,6 +61,15 @@ const double LOG2_10 = 3.321928094887362; /* log_2(10) */ - - GEN gnil, gen_0, gen_1, gen_m1, gen_2, gen_m2, ghalf, err_e_STACK; - -+static const ulong readonly_ghalf_components[] = { -+ evaltyp(t_INT) | _evallg(3), /* gen_1 */ -+ evalsigne(1) | evallgefint(3), -+ 1, -+ evaltyp(t_INT) | _evallg(3), /* gen_2 */ -+ evalsigne(1) | evallgefint(3), -+ 2 -+}; -+ - static const ulong readonly_constants[] = { - evaltyp(t_INT) | _evallg(2), /* gen_0 */ - evallgefint(2), -@@ -78,11 +87,9 @@ static const ulong readonly_constants[] = { - evaltyp(t_INT) | _evallg(3), /* gen_m2 */ - evalsigne(-1) | evallgefint(3), - 2, --}; --static const long readonly_ghalf[] = { - evaltyp(t_FRAC) | _evallg(3), /* ghalf */ -- (long)(readonly_constants+4), -- (long)(readonly_constants+7) -+ (ulong)readonly_ghalf_components, -+ (ulong)(readonly_ghalf_components+3) - }; - static const ulong readonly_err_STACK[] = { - evaltyp(t_ERROR) | _evallg(2), -@@ -496,7 +503,7 @@ init_universal_constants(void) - gen_2 = (GEN)readonly_constants+7; - gen_m1 = (GEN)readonly_constants+10; - gen_m2 = (GEN)readonly_constants+13; -- ghalf = (GEN)readonly_ghalf; -+ ghalf = (GEN)readonly_constants+16; - err_e_STACK = (GEN)readonly_err_STACK; - } - diff --git a/build/pkgs/pari/patches/get_config_options.patch b/build/pkgs/pari/patches/get_config_options.patch deleted file mode 100644 index cb5fda0a21a..00000000000 --- a/build/pkgs/pari/patches/get_config_options.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/config/get_config_options 2010-08-22 21:25:54.000000000 +0200 -+++ b/config/get_config_options 2010-08-31 05:18:55.000000000 +0200 -@@ -58,9 +58,20 @@ - -h|-help|--help|-\?)error=true;; - -v|-verbhelp|--verbhelp)error=verb;; - -s|--static) static=y;; -- -graphic|--graphic) shift; which_graphic_lib=$1;; -+ -graphic|--graphic) -+ shift; which_graphic_lib="$1" -+ case "$which_graphic_lib" in -+ auto|none|X11|qt|Qt|fltk|ps|win32) ;; -+ *) echo "*** Unrecognized graphic lib \"$which_graphic_lib.\"" >&2 -+ error=true;; -+ esac;; - --graphic=*|--graphi=*|--graph=*|--grap=*|--gra=*|--gr=*|--g=*) -- which_graphic_lib=`echo "$1" | sed -e 's/[-a-z]*=//'`;; -+ which_graphic_lib=`echo "$1" | sed -e 's/[-a-z]*=//'` -+ case "$which_graphic_lib" in -+ auto|none|X11|qt|Qt|fltk|ps|win32) ;; -+ *) echo "*** Unrecognized graphic lib \"$which_graphic_lib.\"" >&2 -+ error=true;; -+ esac;; - --with-runtime-perl=*) - runtime_perl=`echo "$1" | sed -e 's/[-a-z]*=//'` ;; - --without-readline|--with-readline=no) without_readline=yes ;; -@@ -139,7 +139,7 @@ - Build Options: - --host= target achitecture - --kernel= kernel used -- --graphic= graphic library used (none, X11, Qt, fltk, ps, win32) -+ --graphic= graphic library used (none, X11, Qt, fltk, ps, win32, auto) - --time= timing function to use (getrusage, clock_gettime, - times, ftime) - --builddir= directory where the object files will be created diff --git a/build/pkgs/pari/patches/pari_str_1.patch b/build/pkgs/pari/patches/pari_str_1.patch new file mode 100644 index 00000000000..bfefeb8f4d3 --- /dev/null +++ b/build/pkgs/pari/patches/pari_str_1.patch @@ -0,0 +1,597 @@ +commit 723b30bbad0e9f6aa578c87a843ece37655b4cfd +Author: Karim Belabas +Date: Tue Jan 24 17:24:57 2017 +0100 + + 34- [libpari] str_init, str_printf, str_putc, str_puts + +diff --git a/doc/usersch5.tex b/doc/usersch5.tex +index 213ddec..02cdf94 100644 +--- a/doc/usersch5.tex ++++ b/doc/usersch5.tex +@@ -11744,6 +11744,35 @@ not a malloc'ed string. + \fun{GEN}{gvsprintf}{const char *fmt, va_list ap} variadic version of + \tet{gsprintf} + ++\subsec{Dynamic strings} ++ ++A \tet{pari_str} is a dynamic string which grows dynamically as needed. ++This structure contains private data and two public members \kbd{char *string}, ++which is the string itself and \kbd{use\_stack} which tells whether the ++string lives ++ ++\item on the PARI stack (value $1$), meaning that it will be destroyed by any ++manipulation of the stack, e.g. a \kbd{gerepile} call or resetting ++\kbd{avma}; ++ ++\item in malloc'ed memory (value $0$), in which case it is impervious to ++stack manipulation but will need to be explicitly freed by the user ++after use, via \kbd{pari\_free(s.string)}. ++ ++ ++\fun{void}{str_init}{pari_str *S, int use_stack} initializes a dynamic ++string; if \kbd{use\_stack} is 0, then the string is malloc'ed, else ++it lives on the PARI stack. ++ ++\fun{void}{str_printf}{pari_str *S, const char *fmt, ...} write to the end ++of $S$ the remaining arguments according to PARI format \kbd{fmt}. ++ ++\fun{void}{str_putc}{pari_str *S, char c} write the character $c$ to the end ++of $S$. ++ ++\fun{void}{str_puts}{pari_str *S, const char *s} write the string $s$ to the ++end of $S$. ++ + \section{Output} + + \subsec{Output contexts} +diff --git a/src/headers/paridecl.h b/src/headers/paridecl.h +index a0da6e6..391873d 100644 +--- a/src/headers/paridecl.h ++++ b/src/headers/paridecl.h +@@ -2806,6 +2806,10 @@ void printtex(GEN g); + char* stack_sprintf(const char *fmt, ...); + char* stack_strcat(const char *s, const char *t); + char* stack_strdup(const char *s); ++void str_init(pari_str *S, int use_stack); ++void str_printf(pari_str *S, const char *fmt, ...); ++void str_putc(pari_str *S, char c); ++void str_puts(pari_str *S, char c); + void strftime_expand(const char *s, char *buf, long max); + GEN Strprintf(const char *fmt, GEN args); + FILE* switchin(const char *name); +diff --git a/src/headers/paristio.h b/src/headers/paristio.h +index 7abce5d..a4fec9e 100644 +--- a/src/headers/paristio.h ++++ b/src/headers/paristio.h +@@ -17,6 +17,14 @@ typedef struct { + long s, us; + } pari_timer; + ++typedef struct pari_str { ++ char *string; /* start of the output buffer */ ++ char *end; /* end of the output buffer */ ++ char *cur; /* current writing place in the output buffer */ ++ size_t size; /* buffer size */ ++ int use_stack; /* use stack_malloc instead of malloc ? */ ++} pari_str; ++ + typedef unsigned char *byteptr; + typedef ulong pari_sp; + +diff --git a/src/language/es.c b/src/language/es.c +index 90ce368..e1bfc8d 100644 +--- a/src/language/es.c ++++ b/src/language/es.c +@@ -41,23 +41,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + + static const char esc = (0x1f & '['); /* C-[ = escape */ + +-typedef struct outString { +- char *string; /* start of the output buffer */ +- char *end; /* end of the output buffer */ +- char *cur; /* current writing place in the output buffer */ +- size_t size; /* buffer size */ +- int use_stack; /* use stack_malloc instead of malloc ? */ +-} outString; ++typedef void (*OUT_FUN)(GEN, pariout_t *, pari_str *); + +-typedef void (*OUT_FUN)(GEN, pariout_t *, outString *); ++static void bruti_sign(GEN g, pariout_t *T, pari_str *S, int addsign); ++static void matbruti(GEN g, pariout_t *T, pari_str *S); ++static void texi_sign(GEN g, pariout_t *T, pari_str *S, int addsign); + +-static void bruti_sign(GEN g, pariout_t *T, outString *S, int addsign); +-static void matbruti(GEN g, pariout_t *T, outString *S); +-static void texi_sign(GEN g, pariout_t *T, outString *S, int addsign); +- +-static void bruti(GEN g, pariout_t *T, outString *S) ++static void bruti(GEN g, pariout_t *T, pari_str *S) + { bruti_sign(g,T,S,1); } +-static void texi(GEN g, pariout_t *T, outString *S) ++static void texi(GEN g, pariout_t *T, pari_str *S) + { texi_sign(g,T,S,1); } + + void +@@ -877,7 +869,7 @@ absrtostr(GEN x, int sp, char FORMAT, long wanted_dec) + + /* l = old len, L = new len */ + static void +-str_alloc0(outString *S, long l, long L) ++str_alloc0(pari_str *S, long l, long L) + { + char *s; + if (S->use_stack) +@@ -896,20 +888,21 @@ str_alloc0(outString *S, long l, long L) + * To avoid automatic extension in between av = avma / avma = av pairs + * [ would destroy S->string if (S->use_stack) ] */ + static void +-str_alloc(outString *S, long l) ++str_alloc(pari_str *S, long l) + { + l *= 20; + if (S->end - S->cur <= l) + str_alloc0(S, S->cur - S->string, S->size + maxss(S->size, l)); + } +-static void +-str_putc(outString *S, char c) { ++void ++str_putc(pari_str *S, char c) ++{ + *S->cur++ = c; + if (S->cur == S->end) str_alloc0(S, S->size, S->size << 1); + } + +-static void +-str_init(outString *S, int use_stack) ++void ++str_init(pari_str *S, int use_stack) + { + char *s; + S->size = 1024; +@@ -918,14 +911,15 @@ str_init(outString *S, int use_stack) + s = (char*)stack_malloc(S->size); + else + s = (char*)pari_malloc(S->size); ++ *s = 0; + S->string = S->cur = s; + S->end = S->string + S->size; + } +-static void +-str_puts(outString *S, const char *s) { while (*s) str_putc(S, *s++); } ++void ++str_puts(pari_str *S, const char *s) { while (*s) str_putc(S, *s++); } + + static void +-str_putscut(outString *S, const char *str, int cut) ++str_putscut(pari_str *S, const char *str, int cut) + { + if (cut < 0) str_puts(S, str); + else { +@@ -937,7 +931,7 @@ str_putscut(outString *S, const char *str, int cut) + static char * + stack_GENtostr_fun(GEN x, pariout_t *T, OUT_FUN out) + { +- outString S; str_init(&S, 1); ++ pari_str S; str_init(&S, 1); + out(x, T, &S); *S.cur = 0; + return S.string; + } +@@ -951,14 +945,14 @@ static char * + GENtostr_fun(GEN x, pariout_t *T, OUT_FUN out) + { + pari_sp av = avma; +- outString S; str_init(&S, 0); ++ pari_str S; str_init(&S, 0); + out(x, T, &S); *S.cur = 0; + avma = av; return S.string; + } + + /* lbuf = strlen(buf), len < 0: unset */ + static void +-outpad(outString *S, const char *buf, long lbuf, int sign, long ljust, long len, long zpad) ++outpad(pari_str *S, const char *buf, long lbuf, int sign, long ljust, long len, long zpad) + { + long padlen = len - lbuf; + if (padlen < 0) padlen = 0; +@@ -983,7 +977,7 @@ outpad(outString *S, const char *buf, long lbuf, int sign, long ljust, long len, + + /* len < 0 or maxwidth < 0: unset */ + static void +-fmtstr(outString *S, const char *buf, int ljust, int len, int maxwidth) ++fmtstr(pari_str *S, const char *buf, int ljust, int len, int maxwidth) + { + int padlen, lbuf = strlen(buf); + +@@ -1000,9 +994,10 @@ fmtstr(outString *S, const char *buf, int ljust, int len, int maxwidth) + /* abs(base) is 8, 10, 16. If base < 0, some "alternate" form + * -- print hex in uppercase + * -- prefix octal with 0 +- * signvalue = -1: unsigned, otherwise ' ' or '+' */ ++ * signvalue = -1: unsigned, otherwise ' ' or '+'. Leaves a messy stack if ++ * S->use_stack */ + static void +-fmtnum(outString *S, long lvalue, GEN gvalue, int base, int signvalue, ++fmtnum(pari_str *S, long lvalue, GEN gvalue, int base, int signvalue, + int ljust, int len, int zpad) + { + int caps; +@@ -1010,7 +1005,7 @@ fmtnum(outString *S, long lvalue, GEN gvalue, int base, int signvalue, + long lbuf, mxl; + GEN uvalue = NULL; + ulong ulvalue = 0; +- pari_sp av = avma; /* Assume !S->use_stack */ ++ pari_sp av = avma; + + if (gvalue) + { +@@ -1159,7 +1154,7 @@ fmtnum(outString *S, long lvalue, GEN gvalue, int base, int signvalue, + lbuf = (buf0 - buf) - 1; + END: + outpad(S, buf, lbuf, signvalue, ljust, len, zpad); +- avma = av; ++ if (!S->use_stack) avma = av; + } + + static GEN +@@ -1213,10 +1208,10 @@ get_sigd(GEN gvalue, char ch, int maxwidth) + } + + static void +-fmtreal(outString *S, GEN gvalue, int space, int signvalue, int FORMAT, ++fmtreal(pari_str *S, GEN gvalue, int space, int signvalue, int FORMAT, + int maxwidth, int ljust, int len, int zpad) + { +- pari_sp av = avma; /* Assume !S->use_stack */ ++ pari_sp av = avma; + long sigd; + char *buf; + +@@ -1281,14 +1276,16 @@ fmtreal(outString *S, GEN gvalue, int space, int signvalue, int FORMAT, + buf = absrtostr(gvalue, space, FORMAT, sigd); + if (signe(gvalue) < 0) signvalue = '-'; + outpad(S, buf, strlen(buf), signvalue, ljust, len, zpad); +- avma = av; ++ if (!S->use_stack) avma = av; + } +-/* format handling "inspired" by the standard draft at ++/* Format handling "inspired" by the standard draft at + -- http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1124.pdf pages 274ff + * fmt is a standard printf format, except 'P' is a "length modifier" +- * allowing GEN arguments. Use either the arg_vector or (if NULL) the va_list */ +-static char * +-sm_dopr(const char *fmt, GEN arg_vector, va_list args) ++ * allowing GEN arguments. Use either the arg_vector or (if NULL) the va_list. ++ * Appent output to the pari_str S, which must be initialized; clean if ++ * !S->use_stack, else leaves objects of stack. */ ++static void ++str_arg_vprintf(pari_str *S, const char *fmt, GEN arg_vector, va_list args) + { + int GENflag = 0, longflag = 0, pointflag = 0; + int print_plus, print_blank, with_sharp, ch, ljust, len, maxwidth, zpad; +@@ -1296,9 +1293,6 @@ sm_dopr(const char *fmt, GEN arg_vector, va_list args) + int index = 1; + GEN gvalue; + const char *save_fmt = fmt; +- outString __S, *S = &__S; +- +- str_init(S, 0); + + while ((ch = *fmt++) != '\0') { + switch(ch) { +@@ -1453,7 +1447,8 @@ nextch: + } + if (gvalue) strvalue = GENtostr_unquoted(gvalue); + fmtstr(S, strvalue, ljust, len, maxwidth); +- avma = av; break; ++ if (!S->use_stack) avma = av; ++ break; + } + case 'c': + if (arg_vector) { +@@ -1489,7 +1484,8 @@ nextch: + } + fmtreal(S, gvalue, GP_DATA->fmt->sp, dosign(print_blank,print_plus), + ch, maxwidth, ljust, len, zpad); +- avma = av; break; ++ if (!S->use_stack) avma = av; ++ break; + } + default: + pari_err(e_MISC, "invalid conversion or specification %c in format `%s'", ch, save_fmt); +@@ -1501,7 +1497,6 @@ nextch: + } /* first switch on ch */ + } /* while loop on ch */ + *S->cur = 0; +- return S->string; + } + + void +@@ -1976,7 +1971,7 @@ itostr(GEN x) { + + /* x != 0 t_INT, write abs(x) to S */ + static void +-str_absint(outString *S, GEN x) ++str_absint(pari_str *S, GEN x) + { + pari_sp av; + long l; +@@ -1993,7 +1988,7 @@ str_absint(outString *S, GEN x) + + /* print e to S (more efficient than sprintf) */ + static void +-str_ulong(outString *S, ulong e) ++str_ulong(pari_str *S, ulong e) + { + if (e == 0) str_putc(S, '0'); + else +@@ -2010,14 +2005,14 @@ str_ulong(outString *S, ulong e) + } + } + static void +-str_long(outString *S, long e) ++str_long(pari_str *S, long e) + { + if (e >= 0) str_ulong(S, (ulong)e); + else { str_putc(S, '-'); str_ulong(S, (ulong)(-e)); } + } + + static void +-wr_vecsmall(pariout_t *T, outString *S, GEN g) ++wr_vecsmall(pariout_t *T, pari_str *S, GEN g) + { + long i, l; + str_puts(S, "Vecsmall(["); l = lg(g); +@@ -2103,7 +2098,7 @@ blancs(long nb) { while (nb-- > 0) pari_putc(' '); } + + /* write an "address" */ + static void +-str_addr(outString *S, ulong x) ++str_addr(pari_str *S, ulong x) + { char s[128]; sprintf(s,"%0*lx", BITS_IN_LONG/4, x); str_puts(S, s); } + static void + dbg_addr(ulong x) { pari_printf("[&=%0*lx] ", BITS_IN_LONG/4, x); } +@@ -2578,7 +2573,7 @@ isdenom(GEN g) + /********************************************************************/ + /* ^e */ + static void +-texexpo(outString *S, long e) ++texexpo(pari_str *S, long e) + { + if (e != 1) { + str_putc(S, '^'); +@@ -2591,27 +2586,27 @@ texexpo(outString *S, long e) + } + } + static void +-wrexpo(outString *S, long e) ++wrexpo(pari_str *S, long e) + { if (e != 1) { str_putc(S, '^'); str_long(S, e); } } + + /* v^e */ + static void +-VpowE(outString *S, const char *v, long e) { str_puts(S, v); wrexpo(S,e); } ++VpowE(pari_str *S, const char *v, long e) { str_puts(S, v); wrexpo(S,e); } + static void +-texVpowE(outString *S, const char *v, long e) { str_puts(S, v); texexpo(S,e); } ++texVpowE(pari_str *S, const char *v, long e) { str_puts(S, v); texexpo(S,e); } + static void +-monome(outString *S, const char *v, long e) ++monome(pari_str *S, const char *v, long e) + { if (e) VpowE(S, v, e); else str_putc(S, '1'); } + static void +-texnome(outString *S, const char *v, long e) ++texnome(pari_str *S, const char *v, long e) + { if (e) texVpowE(S, v, e); else str_putc(S, '1'); } + + /* ( a ) */ + static void +-paren(pariout_t *T, outString *S, GEN a) ++paren(pariout_t *T, pari_str *S, GEN a) + { str_putc(S, '('); bruti(a,T,S); str_putc(S, ')'); } + static void +-texparen(pariout_t *T, outString *S, GEN a) ++texparen(pariout_t *T, pari_str *S, GEN a) + { + if (T->TeXstyle & TEXSTYLE_PAREN) + str_puts(S, " ("); +@@ -2626,15 +2621,15 @@ texparen(pariout_t *T, outString *S, GEN a) + + /* * v^d */ + static void +-times_texnome(outString *S, const char *v, long d) ++times_texnome(pari_str *S, const char *v, long d) + { if (d) { str_puts(S, "\\*"); texnome(S,v,d); } } + static void +-times_monome(outString *S, const char *v, long d) ++times_monome(pari_str *S, const char *v, long d) + { if (d) { str_putc(S, '*'); monome(S,v,d); } } + + /* write a * v^d */ + static void +-wr_monome(pariout_t *T, outString *S, GEN a, const char *v, long d) ++wr_monome(pariout_t *T, pari_str *S, GEN a, const char *v, long d) + { + long sig = isone(a); + +@@ -2648,7 +2643,7 @@ wr_monome(pariout_t *T, outString *S, GEN a, const char *v, long d) + } + } + static void +-wr_texnome(pariout_t *T, outString *S, GEN a, const char *v, long d) ++wr_texnome(pariout_t *T, pari_str *S, GEN a, const char *v, long d) + { + long sig = isone(a); + +@@ -2666,7 +2661,7 @@ wr_texnome(pariout_t *T, outString *S, GEN a, const char *v, long d) + } + + static void +-wr_lead_monome(pariout_t *T, outString *S, GEN a,const char *v, long d, int addsign) ++wr_lead_monome(pariout_t *T, pari_str *S, GEN a,const char *v, long d, int addsign) + { + long sig = isone(a); + if (sig) { +@@ -2679,7 +2674,7 @@ wr_lead_monome(pariout_t *T, outString *S, GEN a,const char *v, long d, int adds + } + } + static void +-wr_lead_texnome(pariout_t *T, outString *S, GEN a,const char *v, long d, int addsign) ++wr_lead_texnome(pariout_t *T, pari_str *S, GEN a,const char *v, long d, int addsign) + { + long sig = isone(a); + if (sig) { +@@ -2693,11 +2688,11 @@ wr_lead_texnome(pariout_t *T, outString *S, GEN a,const char *v, long d, int add + } + + static void +-prints(GEN g, pariout_t *T, outString *S) ++prints(GEN g, pariout_t *T, pari_str *S) + { (void)T; str_long(S, (long)g); } + + static void +-quote_string(outString *S, char *s) ++quote_string(pari_str *S, char *s) + { + str_putc(S, '"'); + while (*s) +@@ -2720,7 +2715,7 @@ quote_string(outString *S, char *s) + } + + static int +-print_0_or_pm1(GEN g, outString *S, int addsign) ++print_0_or_pm1(GEN g, pari_str *S, int addsign) + { + long r; + if (!g) { str_puts(S, "NULL"); return 1; } +@@ -2735,7 +2730,7 @@ print_0_or_pm1(GEN g, outString *S, int addsign) + } + + static void +-print_precontext(GEN g, outString *S, long tex) ++print_precontext(GEN g, pari_str *S, long tex) + { + if (lg(g)<8 || lg(gel(g,7))==1) return; + else +@@ -2755,7 +2750,7 @@ print_precontext(GEN g, outString *S, long tex) + } + + static void +-print_context(GEN g, pariout_t *T, outString *S, long tex) ++print_context(GEN g, pariout_t *T, pari_str *S, long tex) + { + GEN str = closure_get_text(g); + if (lg(g)<8 || lg(gel(g,7))==1) return; +@@ -2804,7 +2799,7 @@ print_context(GEN g, pariout_t *T, outString *S, long tex) + } + + static void +-bruti_intern(GEN g, pariout_t *T, outString *S, int addsign) ++bruti_intern(GEN g, pariout_t *T, pari_str *S, int addsign) + { + long l,i,j,r, tg = typ(g); + GEN a,b; +@@ -3036,14 +3031,14 @@ bruti_intern(GEN g, pariout_t *T, outString *S, int addsign) + } + + static void +-bruti_sign(GEN g, pariout_t *T, outString *S, int addsign) ++bruti_sign(GEN g, pariout_t *T, pari_str *S, int addsign) + { + if (!print_0_or_pm1(g, S, addsign)) + bruti_intern(g, T, S, addsign); + } + + static void +-matbruti(GEN g, pariout_t *T, outString *S) ++matbruti(GEN g, pariout_t *T, pari_str *S) + { + long i, j, r, w, l, *pad = NULL; + pari_sp av; +@@ -3060,7 +3055,7 @@ matbruti(GEN g, pariout_t *T, outString *S) + { + long lgall = 2; /* opening [ and closing ] */ + pari_sp av2; +- outString scratchstr; ++ pari_str scratchstr; + pad = cgetg(l*r+1, t_VECSMALL); /* left on stack if (S->use_stack)*/ + av2 = avma; + str_init(&scratchstr, 1); +@@ -3106,7 +3101,7 @@ matbruti(GEN g, pariout_t *T, outString *S) + /********************************************************************/ + /* this follows bruti_sign */ + static void +-texi_sign(GEN g, pariout_t *T, outString *S, int addsign) ++texi_sign(GEN g, pariout_t *T, pari_str *S, int addsign) + { + long tg,i,j,l,r; + GEN a,b; +@@ -4519,13 +4514,16 @@ out_print0(PariOUT *out, const char *sep, GEN g, long flag) + } + } + static void +-str_print0(outString *S, GEN g, long flag) ++str_print0(pari_str *S, GEN g, long flag) + { + pari_sp av = avma; + OUT_FUN f = get_fun(flag); + long i, l = lg(g); +- for (i = 1; i < l; i++, avma = av) ++ for (i = 1; i < l; i++) ++ { + str_puts(S, stack_GENtostr_fun_unquoted(gel(g,i), GP_DATA->fmt, f)); ++ if (!S->use_stack) avma = av; ++ } + *(S->cur) = 0; + } + +@@ -4533,7 +4531,7 @@ str_print0(outString *S, GEN g, long flag) + char * + pari_sprint0(const char *s, GEN g, long flag) + { +- outString S; ++ pari_str S; + str_init(&S, 0); + str_puts(&S, s); + str_print0(&S, g, flag); +@@ -4544,7 +4542,7 @@ static void + print0_file(FILE *out, GEN g, long flag) + { + pari_sp av = avma; +- outString S; ++ pari_str S; + str_init(&S, 1); + str_print0(&S, g, flag); + fputs(S.string, out); +@@ -4559,7 +4557,16 @@ printsep(const char *s, GEN g) + void + printsep1(const char *s, GEN g) { out_print0(pariOut, s, g, f_RAW); pari_flush(); } + +-/* dummy needed to pass a (empty!) va_list to sm_dopr */ ++static char * ++sm_dopr(const char *fmt, GEN arg_vector, va_list args) ++{ ++ pari_str s; ++ str_init(&s, 0); ++ str_arg_vprintf(&s, fmt, arg_vector, args); ++ return s.string; ++} ++ ++/* dummy needed to pass an empty va_list to sm_dopr */ + static char * + dopr_arg_vector(GEN arg_vector, const char* fmt, ...) + { +@@ -4625,6 +4632,14 @@ pari_sprintf(const char *fmt, ...) /* variadic version of Strprintf */ + va_end(ap); return s; + } + ++void ++str_printf(pari_str *S, const char *fmt, ...) ++{ ++ va_list ap; va_start(ap, fmt); ++ str_arg_vprintf(S, fmt, NULL, ap); ++ va_end(ap); ++} ++ + char * + stack_sprintf(const char *fmt, ...) + { diff --git a/build/pkgs/pari/patches/pari_str_2.patch b/build/pkgs/pari/patches/pari_str_2.patch new file mode 100644 index 00000000000..424cdf600c8 --- /dev/null +++ b/build/pkgs/pari/patches/pari_str_2.patch @@ -0,0 +1,19 @@ +commit 2383190eaceafc234980dfff973477edfa192875 +Author: Karim Belabas +Date: Tue Jan 24 17:29:33 2017 +0100 + + typo in previous patch + +diff --git a/src/headers/paridecl.h b/src/headers/paridecl.h +index 391873d..0cbcf02 100644 +--- a/src/headers/paridecl.h ++++ b/src/headers/paridecl.h +@@ -2809,7 +2809,7 @@ char* stack_strdup(const char *s); + void str_init(pari_str *S, int use_stack); + void str_printf(pari_str *S, const char *fmt, ...); + void str_putc(pari_str *S, char c); +-void str_puts(pari_str *S, char c); ++void str_puts(pari_str *S, const char *s); + void strftime_expand(const char *s, char *buf, long max); + GEN Strprintf(const char *fmt, GEN args); + FILE* switchin(const char *name); diff --git a/build/pkgs/pari/patches/perl_inc.patch b/build/pkgs/pari/patches/perl_inc.patch deleted file mode 100644 index 3bceb89b792..00000000000 --- a/build/pkgs/pari/patches/perl_inc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From af86db438dcc1ec2c2c840cf2ed54a609ea949cf Mon Sep 17 00:00:00 2001 -From: Bill Allombert -Date: Mon, 5 Sep 2016 14:28:16 +0200 -Subject: [PATCH 1/1] perl: add explicit "." in @INC - -perl 5.26 will remove "." from @INC ---- - src/desc/doc_make | 1 + - src/desc/gen_proto | 1 + - src/desc/merge_822 | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/src/desc/doc_make b/src/desc/doc_make -index 2dfbd42..fdc144d 100755 ---- a/src/desc/doc_make -+++ b/src/desc/doc_make -@@ -1,4 +1,5 @@ - #!/usr/bin/perl -+BEGIN { @INC=(".",@INC); } - use warnings FATAL => 'all'; - use strict; - use PARI::822; -diff --git a/src/desc/gen_proto b/src/desc/gen_proto -index ffd94a8..e39252d 100755 ---- a/src/desc/gen_proto -+++ b/src/desc/gen_proto -@@ -1,4 +1,5 @@ - #!/usr/bin/perl -w -+BEGIN { @INC=(".",@INC); } - use PARI::822; - - $class=$ARGV[0]; -diff --git a/src/desc/merge_822 b/src/desc/merge_822 -index 4c9217b..47025ac 100755 ---- a/src/desc/merge_822 -+++ b/src/desc/merge_822 -@@ -1,4 +1,5 @@ - #!/usr/bin/perl -w -+BEGIN { @INC=(".",@INC); } - use PARI::822; - - open(IN, $ARGV[0]) || die "cannot find $ARGV[0]"; --- -2.1.4 - diff --git a/build/pkgs/pari/patches/plot_libpari.patch b/build/pkgs/pari/patches/plot_libpari.patch new file mode 100644 index 00000000000..6c892f6de3f --- /dev/null +++ b/build/pkgs/pari/patches/plot_libpari.patch @@ -0,0 +1,993 @@ +commit bd96c260a028ece5b5a76b43182d839591eac2c9 +Author: Jeroen Demeyer +Date: Mon Jan 9 15:55:05 2017 +0100 + + Move plotting frontend to libpari; initial support for multiple plotting engines + +diff --git a/config/Makefile.SH b/config/Makefile.SH +index ddebdac..a28f9b9 100644 +--- a/config/Makefile.SH ++++ b/config/Makefile.SH +@@ -72,26 +72,32 @@ postconfig=: + plotrunpath= + case "$which_graphic_lib" in + none) +- graph=plotnull;; ++ graph="";; + ps) ++ enable_plot_ps=yes + graph=plotps;; + Qt) ++ enable_plot_qt=yes + PLOTCFLAGS='-D__FANCY_WIN__ -I$(QTDIR)/include' + PLOTLIBS="-L\$(QTDIR)/lib $QTLIB" + graph=plotQt;; + Qt4) ++ enable_plot_qt4=yes + PLOTCFLAGS='-D__FANCY_WIN__ -I$(QTDIR)/include' + PLOTLIBS="-L\$(QTDIR)/lib $QTLIB" + graph=plotQt4;; + fltk) ++ enable_plot_fltk=yes + PLOTCFLAGS= + PLOTLIBS="$FLTK_LIBS" + postconfig='fltk-config --post ' + graph=plotfltk;; + win32) ++ enable_plot_win32=yes + PLOTLIBS="-lgdi32" + graph=plotWin32;; + X11) ++ enable_plot_x=yes + PLOTCFLAGS="$PLOTCFLAGS $X11_INC" + PLOTLIBS="$PLOTLIBS $X11_LIBS" + plotrunpath=$X11 +@@ -100,8 +106,7 @@ win32) + echo >&2 "### Unrecognized graphic library '$which_graphic_lib'." + exit 1;; + esac +-graph="plotport $graph" +-libgraph="plottty" ++libgraph="plotport plottty" + + KERNOBJS= + for f in $kernel; do +@@ -736,10 +741,6 @@ for dir in basemath modules language gp graph systems mt; do + depend="./paricfg.h" + cflags="$cflags \$(DLCFLAGS)" + ;; +- plotport) +- cflags="$cflags -I$src/graph" +- depend="$RECT_H" +- ;; + plotQt) + cflags="$cflags \$(PLOTCFLAGS)" + depend="$RECT_H" +@@ -755,7 +756,7 @@ for dir in basemath modules language gp graph systems mt; do + depend="$RECT_H" + compile="\$(CXX)" + ;; +- plottty) ++ plotport|plottty) + depend="$RECT_H" + cflags="$cflags \$(DLCFLAGS)" + ;; +diff --git a/config/paricfg.h.SH b/config/paricfg.h.SH +index 6fb22fa..c0c9e04 100644 +--- a/config/paricfg.h.SH ++++ b/config/paricfg.h.SH +@@ -188,4 +188,28 @@ case $enable_tls in + yes) echo '#define ENABLE_TLS' >> $file;; + esac + ++case $enable_plot_ps in ++yes) echo '#define ENABLE_PLOT_PS' >> $file;; ++esac ++ ++case $enable_plot_qt in ++yes) echo '#define ENABLE_PLOT_QT' >> $file;; ++esac ++ ++case $enable_plot_qt4 in ++yes) echo '#define ENABLE_PLOT_QT4' >> $file;; ++esac ++ ++case $enable_plot_fltk in ++yes) echo '#define ENABLE_PLOT_FLTK' >> $file;; ++esac ++ ++case $enable_plot_win32 in ++yes) echo '#define ENABLE_PLOT_WIN32' >> $file;; ++esac ++ ++case $enable_plot_x in ++yes) echo '#define ENABLE_PLOT_X' >> $file;; ++esac ++ + echo '#endif' >> $file +diff --git a/src/functions/graphic/plotbox b/src/functions/graphic/plotbox +index 23622f3..f697015 100644 +--- a/src/functions/graphic/plotbox ++++ b/src/functions/graphic/plotbox +@@ -1,5 +1,4 @@ + Function: plotbox +-Class: highlevel + Section: graphic + C-Name: rectbox + Prototype: vLGG +diff --git a/src/functions/graphic/plotclip b/src/functions/graphic/plotclip +index 367f25f..f0943e2 100644 +--- a/src/functions/graphic/plotclip ++++ b/src/functions/graphic/plotclip +@@ -1,5 +1,4 @@ + Function: plotclip +-Class: highlevel + Section: graphic + C-Name: rectclip + Prototype: vL +diff --git a/src/functions/graphic/plotcolor b/src/functions/graphic/plotcolor +index 3754445..2350170 100644 +--- a/src/functions/graphic/plotcolor ++++ b/src/functions/graphic/plotcolor +@@ -1,5 +1,4 @@ + Function: plotcolor +-Class: highlevel + Section: graphic + C-Name: rectcolor + Prototype: vLL +diff --git a/src/functions/graphic/plotcopy b/src/functions/graphic/plotcopy +index 2f32c64..2796f61 100644 +--- a/src/functions/graphic/plotcopy ++++ b/src/functions/graphic/plotcopy +@@ -1,5 +1,4 @@ + Function: plotcopy +-Class: highlevel + Section: graphic + C-Name: rectcopy_gen + Prototype: vLLGGD0,L, +diff --git a/src/functions/graphic/plotcursor b/src/functions/graphic/plotcursor +index b685729..153527b 100644 +--- a/src/functions/graphic/plotcursor ++++ b/src/functions/graphic/plotcursor +@@ -1,5 +1,4 @@ + Function: plotcursor +-Class: highlevel + Section: graphic + C-Name: rectcursor + Prototype: L +diff --git a/src/functions/graphic/plotdraw b/src/functions/graphic/plotdraw +index 0026d33..ced478c 100644 +--- a/src/functions/graphic/plotdraw ++++ b/src/functions/graphic/plotdraw +@@ -1,5 +1,4 @@ + Function: plotdraw +-Class: highlevel + Section: graphic + C-Name: rectdraw_flag + Prototype: vGD0,L, +diff --git a/src/functions/graphic/ploth b/src/functions/graphic/ploth +index 63d4eca..28d2bca 100644 +--- a/src/functions/graphic/ploth ++++ b/src/functions/graphic/ploth +@@ -1,5 +1,4 @@ + Function: ploth +-Class: highlevel + Section: graphic + C-Name: ploth + Prototype: V=GGEpD0,M,D0,L,\nParametric|1; Recursive|2; no_Rescale|4; no_X_axis|8; no_Y_axis|16; no_Frame|32; no_Lines|64; Points_too|128; Splines|256; no_X_ticks|512; no_Y_ticks|1024; Same_ticks|2048; Complex|4096 +@@ -112,3 +111,4 @@ Doc: high precision plot of the function $y=f(x)$ represented by the expression + ploth(X=0,2*Pi,[(1+I)*X,exp(I*X)], "Complex") + @eprog\noindent will draw respectively a circle and a circle cut by the line + $y=x$. ++ %\syn{NO} +diff --git a/src/functions/graphic/plothraw b/src/functions/graphic/plothraw +index 03ceccd..79fed03 100644 +--- a/src/functions/graphic/plothraw ++++ b/src/functions/graphic/plothraw +@@ -1,5 +1,4 @@ + Function: plothraw +-Class: highlevel + Section: graphic + C-Name: plothraw + Prototype: GGD0,L, +diff --git a/src/functions/graphic/plothsizes b/src/functions/graphic/plothsizes +index 8d96047..cc247d8 100644 +--- a/src/functions/graphic/plothsizes ++++ b/src/functions/graphic/plothsizes +@@ -1,5 +1,4 @@ + Function: plothsizes +-Class: highlevel + Section: graphic + C-Name: plothsizes_flag + Prototype: D0,L, +diff --git a/src/functions/graphic/plotinit b/src/functions/graphic/plotinit +index 0c6c709..4d66be6 100644 +--- a/src/functions/graphic/plotinit ++++ b/src/functions/graphic/plotinit +@@ -1,5 +1,4 @@ + Function: plotinit +-Class: highlevel + Section: graphic + C-Name: initrect_gen + Prototype: vLDGDGD0,L, +diff --git a/src/functions/graphic/plotkill b/src/functions/graphic/plotkill +index 182b53b..77699bd 100644 +--- a/src/functions/graphic/plotkill ++++ b/src/functions/graphic/plotkill +@@ -1,5 +1,4 @@ + Function: plotkill +-Class: highlevel + Section: graphic + C-Name: killrect + Prototype: vL +diff --git a/src/functions/graphic/plotlines b/src/functions/graphic/plotlines +index 903b50c..d1ed9f6 100644 +--- a/src/functions/graphic/plotlines ++++ b/src/functions/graphic/plotlines +@@ -1,5 +1,4 @@ + Function: plotlines +-Class: highlevel + Section: graphic + C-Name: rectlines + Prototype: vLGGD0,L, +diff --git a/src/functions/graphic/plotlinetype b/src/functions/graphic/plotlinetype +index 7f96cba..bc23419 100644 +--- a/src/functions/graphic/plotlinetype ++++ b/src/functions/graphic/plotlinetype +@@ -1,5 +1,4 @@ + Function: plotlinetype +-Class: highlevel + Section: graphic + C-Name: rectlinetype + Prototype: vLL +diff --git a/src/functions/graphic/plotmove b/src/functions/graphic/plotmove +index 6bdd6a6..a689794 100644 +--- a/src/functions/graphic/plotmove ++++ b/src/functions/graphic/plotmove +@@ -1,5 +1,4 @@ + Function: plotmove +-Class: highlevel + Section: graphic + C-Name: rectmove + Prototype: vLGG +diff --git a/src/functions/graphic/plotpoints b/src/functions/graphic/plotpoints +index cc6f01d..14e7ee2 100644 +--- a/src/functions/graphic/plotpoints ++++ b/src/functions/graphic/plotpoints +@@ -1,5 +1,4 @@ + Function: plotpoints +-Class: highlevel + Section: graphic + C-Name: rectpoints + Prototype: vLGG +diff --git a/src/functions/graphic/plotpointsize b/src/functions/graphic/plotpointsize +index d8ae632..1cc8a2e 100644 +--- a/src/functions/graphic/plotpointsize ++++ b/src/functions/graphic/plotpointsize +@@ -1,5 +1,4 @@ + Function: plotpointsize +-Class: highlevel + Section: graphic + C-Name: rectpointsize + Prototype: vLG +diff --git a/src/functions/graphic/plotpointtype b/src/functions/graphic/plotpointtype +index e0b4c39..1dc06de 100644 +--- a/src/functions/graphic/plotpointtype ++++ b/src/functions/graphic/plotpointtype +@@ -1,5 +1,4 @@ + Function: plotpointtype +-Class: highlevel + Section: graphic + C-Name: rectpointtype + Prototype: vLL +diff --git a/src/functions/graphic/plotrbox b/src/functions/graphic/plotrbox +index 503695e..b55d149 100644 +--- a/src/functions/graphic/plotrbox ++++ b/src/functions/graphic/plotrbox +@@ -1,5 +1,4 @@ + Function: plotrbox +-Class: highlevel + Section: graphic + C-Name: rectrbox + Prototype: vLGG +diff --git a/src/functions/graphic/plotrecth b/src/functions/graphic/plotrecth +index dcb1528..7f6c66d 100644 +--- a/src/functions/graphic/plotrecth ++++ b/src/functions/graphic/plotrecth +@@ -1,5 +1,4 @@ + Function: plotrecth +-Class: highlevel + Section: graphic + C-Name: rectploth + Prototype: LV=GGEpD0,M,D0,L,\nParametric|1; Recursive|2; no_Rescale|4; no_X_axis|8; no_Y_axis|16; no_Frame|32; no_Lines|64; Points_too|128; Splines|256; no_X_ticks|512; no_Y_ticks|1024; Same_ticks|2048; Complex|4096 +@@ -8,3 +7,4 @@ Help: plotrecth(w,X=a,b,expr,{flag=0},{n=0}): + ploth(w,X=a,b,expr,flag,n). Returns a vector for the bounding box. + Doc: writes to rectwindow $w$ the curve output of + \kbd{ploth}$(w,X=a,b,\var{expr},\fl,n)$. Returns a vector for the bounding box. ++ %\syn{NO} +diff --git a/src/functions/graphic/plotrecthraw b/src/functions/graphic/plotrecthraw +index 305456c..cef2f48 100644 +--- a/src/functions/graphic/plotrecthraw ++++ b/src/functions/graphic/plotrecthraw +@@ -1,5 +1,4 @@ + Function: plotrecthraw +-Class: highlevel + Section: graphic + C-Name: rectplothraw + Prototype: LGD0,L, +diff --git a/src/functions/graphic/plotrline b/src/functions/graphic/plotrline +index 0720718..86d5b77 100644 +--- a/src/functions/graphic/plotrline ++++ b/src/functions/graphic/plotrline +@@ -1,5 +1,4 @@ + Function: plotrline +-Class: highlevel + Section: graphic + C-Name: rectrline + Prototype: vLGG +diff --git a/src/functions/graphic/plotrmove b/src/functions/graphic/plotrmove +index b83c493..6d4afbc 100644 +--- a/src/functions/graphic/plotrmove ++++ b/src/functions/graphic/plotrmove +@@ -1,5 +1,4 @@ + Function: plotrmove +-Class: highlevel + Section: graphic + C-Name: rectrmove + Prototype: vLGG +diff --git a/src/functions/graphic/plotrpoint b/src/functions/graphic/plotrpoint +index 37648ff..707335a 100644 +--- a/src/functions/graphic/plotrpoint ++++ b/src/functions/graphic/plotrpoint +@@ -1,5 +1,4 @@ + Function: plotrpoint +-Class: highlevel + Section: graphic + C-Name: rectrpoint + Prototype: vLGG +diff --git a/src/functions/graphic/plotscale b/src/functions/graphic/plotscale +index 3c81e3d..a8524c9 100644 +--- a/src/functions/graphic/plotscale ++++ b/src/functions/graphic/plotscale +@@ -1,5 +1,4 @@ + Function: plotscale +-Class: highlevel + Section: graphic + C-Name: rectscale + Prototype: vLGGGG +diff --git a/src/functions/graphic/plotstring b/src/functions/graphic/plotstring +index 54792dd..ca79084 100644 +--- a/src/functions/graphic/plotstring ++++ b/src/functions/graphic/plotstring +@@ -1,5 +1,4 @@ + Function: plotstring +-Class: highlevel + Section: graphic + C-Name: rectstring3 + Prototype: vLsD0,L, +diff --git a/src/functions/graphic/psdraw b/src/functions/graphic/psdraw +index 5d3f937..d2757db 100644 +--- a/src/functions/graphic/psdraw ++++ b/src/functions/graphic/psdraw +@@ -1,5 +1,4 @@ + Function: psdraw +-Class: highlevel + Section: graphic + C-Name: postdraw_flag + Prototype: vGD0,L, +diff --git a/src/functions/graphic/psploth b/src/functions/graphic/psploth +index 0911e26..f6c1ffe 100644 +--- a/src/functions/graphic/psploth ++++ b/src/functions/graphic/psploth +@@ -1,5 +1,4 @@ + Function: psploth +-Class: highlevel + Section: graphic + C-Name: postploth + Prototype: V=GGEpD0,L,D0,L, +diff --git a/src/functions/graphic/psplothraw b/src/functions/graphic/psplothraw +index e9b153d..4d99fe7 100644 +--- a/src/functions/graphic/psplothraw ++++ b/src/functions/graphic/psplothraw +@@ -1,5 +1,4 @@ + Function: psplothraw +-Class: highlevel + Section: graphic + C-Name: postplothraw + Prototype: GGD0,L, +diff --git a/src/gp/gp.c b/src/gp/gp.c +index deaeec7..9f00381 100644 +--- a/src/gp/gp.c ++++ b/src/gp/gp.c +@@ -540,6 +540,26 @@ cyg_environment(int argc, char ** argv) + } + #endif + ++/* It's OK if none of the ENABLE_ macros are defined. This will give ++ * an error whenever ploth() is called. */ ++static void ++set_graphic_engine() ++{ ++#if defined(ENABLE_PLOT_X) ++ PARI_get_plot_X(); ++#elif defined(ENABLE_PLOT_FLTK) ++ PARI_get_plot_fltk(); ++#elif defined(ENABLE_PLOT_QT4) ++ PARI_get_plot_Qt4(); ++#elif defined(ENABLE_PLOT_QT) ++ PARI_get_plot_Qt(); ++#elif defined(ENABLE_PLOT_WIN32) ++ PARI_get_plot_Win32(); ++#elif defined(ENABLE_PLOT_PS) ++ PARI_get_plot_ps(); ++#endif ++} ++ + int + main(int argc, char **argv) + { +@@ -562,7 +582,7 @@ main(int argc, char **argv) + pari_init_defaults(); + pari_library_path = DL_DFLT_NAME; + pari_stack_init(&s_A,sizeof(*A),(void**)&A); +- pari_init_opts(1000000 * sizeof(long), 0, INIT_SIGm | INIT_noPRIMEm | INIT_noIMTm); ++ pari_init_opts(1000000 * sizeof(long), 0, INIT_SIGm | INIT_noPRIMEm | INIT_noIMTm | INIT_GRAPHm); + cb_pari_err_recover = gp_err_recover; + cb_pari_pre_recover = gp_pre_recover; + cb_pari_break_loop = break_loop; +@@ -576,7 +596,7 @@ main(int argc, char **argv) + pari_add_module(functions_gp); + pari_add_module(functions_highlevel); + +- init_graph(); ++ set_graphic_engine(); + cb_pari_quit = gp_quit; + cb_pari_whatnow = whatnow; + cb_pari_sigint = gp_sigint_fun; +@@ -643,8 +663,7 @@ dbg_up(long k) + void + gp_quit(long code) + { +- free_graph(); +- pari_close(); ++ pari_close_opts(INIT_JMPm | INIT_SIGm | INIT_DFTm | INIT_GRAPHm); + kill_buffers_upto(NULL); + if (!(GP_DATA->flags & gpd_QUIET)) pari_puts("Goodbye!\n"); + if (cb_pari_end_output) cb_pari_end_output(); +diff --git a/src/gp/gp.h b/src/gp/gp.h +index d89fdc9..6ee391f 100644 +--- a/src/gp/gp.h ++++ b/src/gp/gp.h +@@ -33,4 +33,14 @@ extern void (*cb_gp_output)(GEN z); + extern void (*cb_pari_end_output)(void); + + extern entree functions_highlevel[], functions_gp[]; ++ ++/* Architecture-dependent plot files (src/graph/plotX.c ...). ++ * Note that not all these might be compiled! */ ++void PARI_get_plot_X(void); ++void PARI_get_plot_fltk(void); ++void PARI_get_plot_Qt4(void); ++void PARI_get_plot_Qt(void); ++void PARI_get_plot_Win32(void); ++void PARI_get_plot_ps(void); ++ + ENDEXTERN +diff --git a/src/graph/plotQt.c b/src/graph/plotQt.c +index 9aa3a81..d8adebf 100644 +--- a/src/graph/plotQt.c ++++ b/src/graph/plotQt.c +@@ -566,20 +566,13 @@ void PlotWindow::save( int id) { + #endif // __FANCY_WIN__ + + +- +-// +-// Implementation of the two architecture-dependent functions +-// (from rect.h) requested by pari's plotting routines +-// +- +- +-void +-rectdraw0(long *w, long *x, long *y, long lw) ++/* Interface to PARI's plotting functions */ ++static void ++draw(long *w, long *x, long *y, long lw) + { + if (pari_daemon()) return; // parent process returns + + pari_close(); +- PARI_get_plot(); + + // launch Qt window + int argc = 1; char *argv[] = { "gp", "-qws"}; // set argc = 2 for cross +@@ -606,10 +599,9 @@ rectdraw0(long *w, long *x, long *y, long lw) + } + + void +-PARI_get_plot(void) ++PARI_get_plot_Qt(void) + /* This function initialises the structure rect.h: pari_plot */ + { +- if (pari_plot.init) return; // pari_plot is already set + #ifdef __QPE__ + pari_plot.width = 240; // width and + pari_plot.height = 320; // height of plot window +@@ -621,5 +613,6 @@ PARI_get_plot(void) + pari_plot.vunit = 3; // + pari_plot.fwidth = 6; // font width + pari_plot.fheight = 9; // and height ++ pari_plot.draw = &draw; + pari_plot.init = 1; // flag: pari_plot is set now! + } +diff --git a/src/graph/plotQt4.c b/src/graph/plotQt4.c +index 1ef7c40..13c8905 100644 +--- a/src/graph/plotQt4.c ++++ b/src/graph/plotQt4.c +@@ -553,20 +553,13 @@ void PlotWindow::save( int id) + #endif // __FANCY_WIN__ + + +- +-// +-// Implementation of the two architecture-dependent functions +-// (from rect.h) requested by pari's plotting routines +-// +- +- +-void +-rectdraw0(long *w, long *x, long *y, long lw) ++/* Interface to PARI's plotting functions */ ++static void ++draw(long *w, long *x, long *y, long lw) + { + if (pari_daemon()) return; // parent process returns + + pari_close(); +- PARI_get_plot(); + + // launch Qt window + int argc = 1; // set argc = 2 for cross +@@ -593,10 +586,9 @@ rectdraw0(long *w, long *x, long *y, long lw) + } + + void +-PARI_get_plot(void) ++PARI_get_plot_Qt4(void) + /* This function initialises the structure rect.h: pari_plot */ + { +- if (pari_plot.init) return; // pari_plot is already set + #ifdef __QPE__ + pari_plot.width = 240; // width and + pari_plot.height = 320; // height of plot window +@@ -608,5 +600,6 @@ PARI_get_plot(void) + pari_plot.vunit = 3; // + pari_plot.fwidth = 6; // font width + pari_plot.fheight = 9; // and height ++ pari_plot.draw = &draw; + pari_plot.init = 1; // flag: pari_plot is set now! + } +diff --git a/src/graph/plotWin32.c b/src/graph/plotWin32.c +index 8af4d66..6ca8b9b 100644 +--- a/src/graph/plotWin32.c ++++ b/src/graph/plotWin32.c +@@ -68,7 +68,10 @@ static void DrawString(void *data, long x, long y, char *text, long numtext) + TextOut((HDC)data, x, y, text, numtext); + } + +-void rectdraw0(long *w, long *x, long *y, long lw) ++ ++/* Interface to PARI's plotting functions */ ++static void ++draw(long *w, long *x, long *y, long lw) + { + char tmppath[MAX_PATH], fname[MAX_PATH]; + struct plot_eng plotWin32; +@@ -102,13 +105,11 @@ void rectdraw0(long *w, long *x, long *y, long lw) + } + + void +-PARI_get_plot(void) ++PARI_get_plot_Win32(void) + { + HDC hdc; + TEXTMETRIC tm; +- if (pari_plot.init) return; /* pari_plot is already set */ + +- pari_plot.init = 1; + pari_plot.width = GetSystemMetrics(SM_CXSCREEN)/2; + pari_plot.height = GetSystemMetrics(SM_CYSCREEN)/2; + pari_plot.hunit = pari_plot.width/100; +@@ -121,4 +122,6 @@ PARI_get_plot(void) + + pari_plot.fwidth = tm.tmAveCharWidth; + pari_plot.fheight = tm.tmHeight; ++ pari_plot.draw = &draw; ++ pari_plot.init = 1; + } +diff --git a/src/graph/plotX.c b/src/graph/plotX.c +index 13bf839..b0b6e4e 100644 +--- a/src/graph/plotX.c ++++ b/src/graph/plotX.c +@@ -154,8 +154,10 @@ PARI_ColorSetUp(Display *display, GEN colors) + } + } + +-void +-rectdraw0(long *w, long *x, long *y, long lw) ++ ++/* Interface to PARI's plotting functions */ ++static void ++draw(long *w, long *x, long *y, long lw) + { + long oldwidth,oldheight; + struct plot_eng plotX; +@@ -173,7 +175,6 @@ rectdraw0(long *w, long *x, long *y, long lw) + + if (pari_daemon()) return; /* parent process returns */ + +- PARI_get_plot(); + pari_close(); + + display = XOpenDisplay(NULL); +@@ -279,13 +280,12 @@ EXIT: + } + + void +-PARI_get_plot(void) ++PARI_get_plot_X(void) + { + Display *display; + int screen; + +- if (pari_plot.init) return; +- if (!(display = XOpenDisplay(NULL))) pari_err(e_MISC, "no X server"); ++ if (!(display = XOpenDisplay(NULL))) {pari_warn(warner, "no X server"); return;} + screen = DefaultScreen(display); + pari_plot.width = DisplayWidth(display, screen) - 40; + pari_plot.height = DisplayHeight(display, screen) - 60; +@@ -293,6 +293,7 @@ PARI_get_plot(void) + pari_plot.fwidth = 9; + pari_plot.hunit = 5; + pari_plot.vunit = 5; +- pari_plot.init = 1; ++ pari_plot.draw = &draw; ++ pari_plot.init = 1; + XCloseDisplay(display); + } +diff --git a/src/graph/plotfltk.c b/src/graph/plotfltk.c +index 3879728..92abcbd 100644 +--- a/src/graph/plotfltk.c ++++ b/src/graph/plotfltk.c +@@ -189,20 +189,16 @@ int Plotter::handle(int event) + } + } + +-// +-// Implementation of the two architecture-dependent functions +-// (from rect.h) requested by pari's plotting routines +-// + +-void +-rectdraw0(long *w, long *x, long *y, long lw) ++/* Interface to PARI's plotting functions */ ++static void ++fltk_draw(long *w, long *x, long *y, long lw) + { + Plotter *win; + + if (pari_daemon()) return; // parent process returns + + pari_close(); +- PARI_get_plot(); + + Fl::visual(FL_DOUBLE|FL_INDEX); + win = new Plotter( w, x, y, lw); +@@ -215,15 +211,15 @@ rectdraw0(long *w, long *x, long *y, long lw) + } + + void +-PARI_get_plot(void) ++PARI_get_plot_fltk(void) + /* This function initialises the structure rect.h: pari_plot */ + { +- if (pari_plot.init) return; // pari_plot is already set + pari_plot.width = 400; // width and + pari_plot.height = 300; // height of plot window + pari_plot.hunit = 3; // + pari_plot.vunit = 3; // + pari_plot.fwidth = 6; // font width + pari_plot.fheight = 9; // and height ++ pari_plot.draw = &fltk_draw; + pari_plot.init = 1; // flag: pari_plot is set now! + } +diff --git a/src/graph/plotnull.c b/src/graph/plotnull.c +deleted file mode 100644 +index fdf26e3..0000000 +--- a/src/graph/plotnull.c ++++ /dev/null +@@ -1,28 +0,0 @@ +-/* Copyright (C) 2000 The PARI group. +- +-This file is part of the PARI/GP package. +- +-PARI/GP is free software; you can redistribute it and/or modify it under the +-terms of the GNU General Public License as published by the Free Software +-Foundation. It is distributed in the hope that it will be useful, but WITHOUT +-ANY WARRANTY WHATSOEVER. +- +-Check the License for details. You should have received a copy of it, along +-with the package; see the file 'COPYING'. If not, write to the Free Software +-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +- +-#include "pari.h" +-#include "rect.h" +- +-void +-rectdraw0(long *w, long *x, long *y, long lw) +-{ +- (void)w; +- (void)x; +- (void)y; +- (void)lw; +-} +- +-void +-PARI_get_plot(void) +-{ pari_err(e_MISC,"high resolution graphics disabled"); } +diff --git a/src/graph/plotport.c b/src/graph/plotport.c +index c6de38f..71eba71 100644 +--- a/src/graph/plotport.c ++++ b/src/graph/plotport.c +@@ -54,6 +54,13 @@ READ_EXPR(GEN code, GEN x) { + /** **/ + /********************************************************************/ + void ++PARI_get_plot(void) ++{ ++ if (!pari_plot.init) ++ pari_err(e_MISC, "high resolution graphics disabled"); ++} ++ ++void + init_graph(void) + { + long n; +@@ -1565,7 +1572,7 @@ rectplothrawin(long grect, dblPointList *data, long flags) + if (W) + { + if (W == &pari_plot) +- rectdraw0(w,wx,wy,2); ++ W->draw(w,wx,wy,2); + else + postdraw0(w,wx,wy,2, 0); + killrect(w[1]); +@@ -1704,6 +1711,7 @@ PARI_get_psplot(void) + pari_psplot.fwidth = 6; + pari_psplot.hunit = 5; + pari_psplot.vunit = 5; ++ pari_psplot.draw = NULL; /* Currently unused for ps plotting */ + } + + static void +@@ -1736,7 +1744,13 @@ gendraw(GEN list, long ps, long flag) + ne = itos(win); check_rect(ne); + w[i] = ne; + } +- if (ps) postdraw0(w,x,y,n,flag); else rectdraw0(w,x,y,n); ++ if (ps) ++ postdraw0(w,x,y,n,flag); ++ else ++ { ++ PARI_get_plot(); ++ pari_plot.draw(w,x,y,n); ++ } + pari_free(x); pari_free(y); pari_free(w); + } + +diff --git a/src/graph/plotps.c b/src/graph/plotps.c +index dcdecc1..bee35bf 100644 +--- a/src/graph/plotps.c ++++ b/src/graph/plotps.c +@@ -19,8 +19,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + #include "paripriv.h" + #include "rect.h" + +-void +-rectdraw0(long *w, long *x, long *y, long lw) ++ ++/* Interface to PARI's plotting functions */ ++static void ++draw(long *w, long *x, long *y, long lw) + { + struct plot_eng plot; + FILE *file; +@@ -44,14 +46,14 @@ rectdraw0(long *w, long *x, long *y, long lw) + } + + void +-PARI_get_plot(void) ++PARI_get_plot_ps(void) + { +- if (pari_plot.init) return; + pari_plot.width = 400; + pari_plot.height = 300; + pari_plot.fheight = 9; + pari_plot.fwidth = 6; + pari_plot.hunit = 3; + pari_plot.vunit = 3; +- pari_plot.init = 1; ++ pari_plot.draw = &draw; ++ pari_plot.init = 1; + } +diff --git a/src/graph/rect.h b/src/graph/rect.h +index b8a3476..acc78a1 100644 +--- a/src/graph/rect.h ++++ b/src/graph/rect.h +@@ -23,6 +23,7 @@ typedef struct PARI_plot { + long fheight; + long init; + char name[PLOT_NAME_LEN+1]; ++ void (*draw)(long *w, long *x, long *y, long lw); + } PARI_plot; + + extern PARI_plot pari_plot, pari_psplot; +@@ -233,54 +234,12 @@ extern long rectline_itype; + /* plotport.c */ + typedef long (*col_counter)[ROt_MAX]; + +-void color_to_rgb(GEN c, int *r, int *g, int *b); +-void initrect(long ne, long x, long y); +-void initrect_gen(long ne, GEN x, GEN y, long flag); +-void killrect(long ne); + void plot_count(long *w, long lw, col_counter rcolcnt); +-GEN ploth(GEN a, GEN b, GEN code, long prec, long flag, long numpoints); +-GEN ploth2(GEN a, GEN b, GEN code, long prec); +-GEN plothmult(GEN a, GEN b, GEN code, long prec); +-GEN plothraw(GEN listx, GEN listy, long flag); +-GEN plothsizes(void); +-GEN plothsizes_flag(long flag); +-void postdraw(GEN list); +-void postdraw_flag(GEN list, long flag); +-GEN postploth(GEN a,GEN b,GEN code,long prec,long flag,long numpoints); +-GEN postploth2(GEN a,GEN b,GEN code,long prec,long numpoints); +-GEN postplothraw(GEN listx, GEN listy, long flag); +-void psplot_init(struct plot_eng *S, FILE *f, double xscale, double yscale, long fontsize); + void Printx(dblPointList *f); +-void rectbox(long ne, GEN gx2, GEN gy2); +-void rectcolor(long ne, long color); +-void rectcopy(long source, long dest, long xoff, long yoff); +-void rectcopy_gen(long source, long dest, GEN xoff, GEN yoff, long flag); +-GEN rectcursor(long ne); +-void rectdraw(GEN list); +-void rectdraw_flag(GEN list, long flag); +-void rectline(long ne, GEN gx2, GEN gy2); +-void rectlines(long ne, GEN listx, GEN listy, long flag); +-void rectlinetype(long ne, long t); +-void rectmove(long ne, GEN x, GEN y); +-GEN rectploth(long drawrect,GEN a, GEN b, GEN code, long prec, ulong flags, long testpoints); +-GEN rectplothraw(long drawrect, GEN data, long flags); +-void rectpoint(long ne, GEN x, GEN y); +-void rectpoints(long ne, GEN listx, GEN listy); +-void rectpointtype(long ne, long t); +-void rectpointsize(long ne, GEN size); +-void rectrbox(long ne, GEN gx2, GEN gy2); +-void rectrline(long ne, GEN gx2, GEN gy2); +-void rectrmove(long ne, GEN x, GEN y); +-void rectrpoint(long ne, GEN x, GEN y); +-void rectscale(long ne, GEN x1, GEN x2, GEN y1, GEN y2); +-void rectstring(long ne, char *x); +-void rectstring3(long ne, char *x, long dir); +-void rectclip(long rect); +- +-void gen_rectdraw0(struct plot_eng *eng, long *w, long *x, long *y, long lw, double xs, double ys); +- +-/* architecture-dependent plot file (plotX.c ...) */ ++void psplot_init(struct plot_eng *S, FILE *f, double xscale, double yscale, long fontsize); ++ ++void gen_rectdraw0(struct plot_eng *eng, long *w, long *x, long *y, long lw, double xs, double ys); ++ + void PARI_get_plot(void); +-void rectdraw0(long *w, long *x, long *y, long lw); + + ENDEXTERN +diff --git a/src/headers/paricom.h b/src/headers/paricom.h +index 356ce51..85765c9 100644 +--- a/src/headers/paricom.h ++++ b/src/headers/paricom.h +@@ -99,7 +99,8 @@ enum { + INIT_DFTm = 4, + INIT_noPRIMEm = 8, + INIT_noIMTm = 16, +- INIT_noINTGMPm = 32 ++ INIT_noINTGMPm = 32, ++ INIT_GRAPHm = 64 + }; + + #ifndef HAS_EXP2 +diff --git a/src/headers/paridecl.h b/src/headers/paridecl.h +index 5565efe..98ee286 100644 +--- a/src/headers/paridecl.h ++++ b/src/headers/paridecl.h +@@ -4054,6 +4054,53 @@ GEN polmodular(long L, long inv, GEN x, long yvar, long compute_derivs); + GEN polmodular_ZM(long L, long inv); + GEN polmodular_ZXX(long L, long inv, long xvar, long yvar); + ++/* plotport.c */ ++ ++void color_to_rgb(GEN c, int *r, int *g, int *b); ++void initrect(long ne, long x, long y); ++void initrect_gen(long ne, GEN x, GEN y, long flag); ++void killrect(long ne); ++GEN ploth(GEN a, GEN b, GEN code, long prec, long flag, long numpoints); ++GEN ploth2(GEN a, GEN b, GEN code, long prec); ++GEN plothmult(GEN a, GEN b, GEN code, long prec); ++GEN plothraw(GEN listx, GEN listy, long flag); ++GEN plothsizes(void); ++GEN plothsizes_flag(long flag); ++void postdraw(GEN list); ++void postdraw_flag(GEN list, long flag); ++GEN postploth(GEN a,GEN b,GEN code,long prec,long flag,long numpoints); ++GEN postploth2(GEN a,GEN b,GEN code,long prec,long numpoints); ++GEN postplothraw(GEN listx, GEN listy, long flag); ++void rectbox(long ne, GEN gx2, GEN gy2); ++void rectcolor(long ne, long color); ++void rectcopy(long source, long dest, long xoff, long yoff); ++void rectcopy_gen(long source, long dest, GEN xoff, GEN yoff, long flag); ++GEN rectcursor(long ne); ++void rectdraw(GEN list); ++void rectdraw_flag(GEN list, long flag); ++void rectline(long ne, GEN gx2, GEN gy2); ++void rectlines(long ne, GEN listx, GEN listy, long flag); ++void rectlinetype(long ne, long t); ++void rectmove(long ne, GEN x, GEN y); ++GEN rectploth(long drawrect,GEN a, GEN b, GEN code, long prec, ulong flags, long testpoints); ++GEN rectplothraw(long drawrect, GEN data, long flags); ++void rectpoint(long ne, GEN x, GEN y); ++void rectpoints(long ne, GEN listx, GEN listy); ++void rectpointtype(long ne, long t); ++void rectpointsize(long ne, GEN size); ++void rectrbox(long ne, GEN gx2, GEN gy2); ++void rectrline(long ne, GEN gx2, GEN gy2); ++void rectrmove(long ne, GEN x, GEN y); ++void rectrpoint(long ne, GEN x, GEN y); ++void rectscale(long ne, GEN x1, GEN x2, GEN y1, GEN y2); ++void rectstring(long ne, char *x); ++void rectstring3(long ne, char *x, long dir); ++void rectclip(long rect); ++ ++/* plottty.c */ ++ ++void pariplot(GEN a, GEN b, GEN code, GEN ysmlu, GEN ybigu, long prec); ++ + /* prime.c */ + + long BPSW_isprime(GEN x); +@@ -4161,7 +4208,6 @@ GEN derivfunk(void *E, GEN (*eval)(void *, GEN, long), GEN x, GEN ind0, long + int forvec_init(forvec_t *T, GEN x, long flag); + GEN forvec_next(forvec_t *T); + GEN limitnum(void *E, GEN (*f)(void *,GEN,long), long muli, GEN alpha, long prec); +-void pariplot(GEN a, GEN b, GEN code, GEN ysmlu, GEN ybigu, long prec); + GEN polzag(long n, long m); + GEN prodeuler(void *E, GEN (*eval)(void *, GEN), GEN ga, GEN gb, long prec); + GEN prodinf(void *E, GEN (*eval)(void *, GEN), GEN a, long prec); +diff --git a/src/language/init.c b/src/language/init.c +index 1524531..7c8e7de 100644 +--- a/src/language/init.c ++++ b/src/language/init.c +@@ -883,6 +883,7 @@ pari_init_opts(size_t parisize, ulong maxprime, ulong init_opts) + try_to_recover = 1; + if (!(init_opts&INIT_noIMTm)) pari_mt_init(); + if ((init_opts&INIT_SIGm)) pari_sig_init(pari_sighandler); ++ if ((init_opts&INIT_GRAPHm)) init_graph(); + } + + void +@@ -936,6 +937,7 @@ pari_close_opts(ulong init_opts) + free((void*)GP_DATA->prompt_cont); + free((void*)GP_DATA->histfile); + } ++ if (init_opts&INIT_GRAPHm) free_graph(); + BLOCK_SIGINT_END; + } + diff --git a/build/pkgs/pari/patches/plot_svg.patch b/build/pkgs/pari/patches/plot_svg.patch new file mode 100644 index 00000000000..0d640051cd5 --- /dev/null +++ b/build/pkgs/pari/patches/plot_svg.patch @@ -0,0 +1,228 @@ +commit 6ce728df0719490910a3f73cd075704af9e7b0e8 +Author: Jeroen Demeyer +Date: Wed Jan 11 09:56:02 2017 +0100 + + Implement SVG plotting + +diff --git a/config/Makefile.SH b/config/Makefile.SH +index a28f9b9..c50024e 100644 +--- a/config/Makefile.SH ++++ b/config/Makefile.SH +@@ -106,7 +106,7 @@ win32) + echo >&2 "### Unrecognized graphic library '$which_graphic_lib'." + exit 1;; + esac +-libgraph="plotport plottty" ++libgraph="plotport plottty plotsvg" + + KERNOBJS= + for f in $kernel; do +@@ -756,7 +756,7 @@ for dir in basemath modules language gp graph systems mt; do + depend="$RECT_H" + compile="\$(CXX)" + ;; +- plotport|plottty) ++ plotport|plotsvg|plottty) + depend="$RECT_H" + cflags="$cflags \$(DLCFLAGS)" + ;; +diff --git a/src/graph/plotsvg.c b/src/graph/plotsvg.c +new file mode 100644 +index 0000000..844ef2e +--- /dev/null ++++ b/src/graph/plotsvg.c +@@ -0,0 +1,177 @@ ++/* Copyright (C) 2017 The PARI group. ++ ++This file is part of the PARI/GP package. ++ ++This program is free software; you can redistribute it and/or modify ++it under the terms of the GNU General Public License as published by ++the Free Software Foundation; either version 2 of the License, or ++(at your option) any later version. ++ ++This program is distributed in the hope that it will be useful, ++but WITHOUT ANY WARRANTY; without even the implied warranty of ++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++GNU General Public License for more details. ++ ++You should have received a copy of the GNU General Public License along ++with this program; if not, write to the Free Software Foundation, Inc., ++51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++*/ ++ ++#include "pari.h" ++#include "paripriv.h" ++#include "rect.h" ++ ++/* Callback function to be called whenever an SVG plot is produced. ++ * The callback takes one argument, a const char* containing the text of ++ * the SVG file. */ ++cb_plot_svg_t cb_plot_svg = pari_puts; ++ ++struct svg_data { ++ pari_str str; ++ char hexcolor[8]; /* "#rrggbb\0" */ ++}; ++#define data_str(d) (&((struct svg_data*)(d))->str) ++#define data_hexcolor(d) (((struct svg_data*)(d))->hexcolor) ++ ++static const char hexdigit[16] = "0123456789abcdef"; ++ ++/* Work with precision 1/scale */ ++static const float scale = 1024.0; ++#define rescale(x) ((float)(x) / scale) ++ ++ ++static void ++svg_point(void *data, long x, long y) ++{ ++ pari_str *S = data_str(data); ++ ++ str_printf(S, "\n", data_hexcolor(data)); ++} ++ ++static void ++svg_line(void *data, long x1, long y1, long x2, long y2) ++{ ++ pari_str *S = data_str(data); ++ ++ str_printf(S, "\n", data_hexcolor(data)); ++} ++ ++static void ++svg_rect(void *data, long x, long y, long w, long h) ++{ ++ pari_str *S = data_str(data); ++ ++ str_printf(S, "\n", data_hexcolor(data)); ++} ++ ++static void ++svg_points(void *data, long nb, struct plot_points *p) ++{ ++ long i; ++ for (i = 0; i < nb; i++) ++ svg_point(data, p[i].x, p[i].y); ++} ++ ++static void ++svg_color(void *data, long col) ++{ ++ int r, g, b; ++ char *hexcolor = data_hexcolor(data); ++ color_to_rgb(gel(GP_DATA->colormap, col+1), &r, &g, &b); ++ hexcolor[0] = '#'; ++ hexcolor[1] = hexdigit[r / 16]; ++ hexcolor[2] = hexdigit[r & 15]; ++ hexcolor[3] = hexdigit[g / 16]; ++ hexcolor[4] = hexdigit[g & 15]; ++ hexcolor[5] = hexdigit[b / 16]; ++ hexcolor[6] = hexdigit[b & 15]; ++ hexcolor[7] = '\0'; ++} ++ ++static void ++svg_lines(void *data, long nb, struct plot_points *p) ++{ ++ long i; ++ pari_str *S = data_str(data); ++ ++ str_printf(S, "\n", data_hexcolor(data)); ++} ++ ++static void ++svg_text(void *data, long x, long y, char *text, long numtext) ++{ ++ pari_str *S = data_str(data); ++ ++ str_printf(S, "%s\n", ++ rescale(x), rescale(y), pari_plot.fheight, data_hexcolor(data), text); ++} ++ ++static void ++svg_head(pari_str *S) ++{ ++ str_printf(S, "\n", ++ pari_plot.width, pari_plot.height); ++} ++ ++static void ++svg_tail(pari_str *S) ++{ ++ str_printf(S, "\n"); ++} ++ ++ ++/* Interface to PARI's plotting functions */ ++static void ++svg_draw(long *w, long *x, long *y, long lw) ++{ ++ struct plot_eng pl; ++ struct svg_data data; ++ ++ /* Initialize data */ ++ str_init(&data.str, 0); ++ svg_color(&data, 0); ++ ++ /* Initialize pl */ ++ pl.data = &data; ++ pl.sc = &svg_color; ++ pl.pt = &svg_point; ++ pl.ln = &svg_line; ++ pl.bx = &svg_rect; ++ pl.mp = &svg_points; ++ pl.ml = &svg_lines; ++ pl.st = &svg_text; ++ pl.pl = &pari_plot; ++ ++ svg_head(&data.str); ++ gen_rectdraw0(&pl, w, x, y, lw, scale, scale); ++ svg_tail(&data.str); ++ ++ cb_plot_svg(data.str.string); ++ pari_free(data.str.string); ++} ++ ++void ++PARI_get_plot_svg() ++/* This function initialises the structure rect.h: pari_plot */ ++{ ++ pari_plot.width = 480; // width and ++ pari_plot.height = 320; // height of plot window ++ pari_plot.hunit = 3; // ++ pari_plot.vunit = 3; // ++ pari_plot.fwidth = 9; // font width ++ pari_plot.fheight = 12; // and height ++ pari_plot.draw = &svg_draw; ++ pari_plot.init = 1; // flag: pari_plot is set now! ++} +diff --git a/src/headers/paridecl.h b/src/headers/paridecl.h +index 98ee286..293732f 100644 +--- a/src/headers/paridecl.h ++++ b/src/headers/paridecl.h +@@ -4097,6 +4097,12 @@ void rectstring(long ne, char *x); + void rectstring3(long ne, char *x, long dir); + void rectclip(long rect); + ++/* plotsvg.c */ ++ ++typedef void (*cb_plot_svg_t)(const char *svg); ++void PARI_get_plot_svg(); ++extern cb_plot_svg_t cb_plot_svg; ++ + /* plottty.c */ + + void pariplot(GEN a, GEN b, GEN code, GEN ysmlu, GEN ybigu, long prec); diff --git a/build/pkgs/pari/patches/prot_none.patch b/build/pkgs/pari/patches/prot_none_1.patch similarity index 51% rename from build/pkgs/pari/patches/prot_none.patch rename to build/pkgs/pari/patches/prot_none_1.patch index 656aad5a8b1..45d338f426e 100644 --- a/build/pkgs/pari/patches/prot_none.patch +++ b/build/pkgs/pari/patches/prot_none_1.patch @@ -1,6 +1,6 @@ -commit bce6fb9c22e2150ccff95b68034f1a09fe06f59c +commit f7d82845952ec92a5c3fa6f1b8b42236f9d80c21 Author: Jeroen Demeyer -Date: Fri Sep 23 22:01:46 2016 +0200 +Date: Tue Nov 22 13:39:20 2016 +0100 Use PROT_NONE for unused virtual stack memory @@ -27,10 +27,10 @@ index 87d93cf..fa79053 100644 return 0; } diff --git a/src/language/init.c b/src/language/init.c -index 439e279..be87a79 100644 +index 1524531..c7a90f0 100644 --- a/src/language/init.c +++ b/src/language/init.c -@@ -624,14 +624,11 @@ pari_add_defaults_module(entree *ep) +@@ -579,14 +579,11 @@ pari_add_defaults_module(entree *ep) #ifndef MAP_ANONYMOUS #define MAP_ANONYMOUS MAP_ANON #endif @@ -46,25 +46,53 @@ index 439e279..be87a79 100644 return (b == MAP_FAILED) ? NULL: b; } -@@ -641,10 +638,39 @@ pari_mainstack_mfree(void *s, size_t size) +@@ -596,10 +593,58 @@ pari_mainstack_mfree(void *s, size_t size) munmap(s, size); } --static void ++/* Completely discard the memory mapped between the addresses "from" ++ * and "to" (which must be page-aligned). ++ * ++ * We use mmap() with PROT_NONE, which means that the underlying memory ++ * is freed and that the kernel should not commit memory for it. We ++ * still keep the mapping such that we can change the flags to ++ * PROT_READ|PROT_WRITE later. ++ * ++ * NOTE: remapping with MAP_FIXED and PROT_NONE is not the same as ++ * calling mprotect(..., PROT_NONE) because the latter will keep the ++ * memory committed (this is in particular relevant on Linux with ++ * vm.overcommit = 2). This remains true even when calling ++ * madvise(..., MADV_DONTNEED). */ + static void -pari_mainstack_mreset(void *s, size_t size) ++pari_mainstack_mreset(pari_sp from, pari_sp to) + { +- madvise(s, size, MADV_DONTNEED); ++ size_t s = to - from; ++ mmap((void*)from, s, PROT_NONE, MAP_FIXED|MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); ++} ++ ++/* Commit (make available) the virtual memory mapped between the ++ * addresses "from" and "to" (which must be page-aligned). ++ * Return 0 if successful, -1 if failed. */ ++static int ++pari_mainstack_mextend(pari_sp from, pari_sp to) ++{ ++ size_t s = to - from; ++ return mprotect((void*)from, s, PROT_READ|PROT_WRITE); ++} ++ +/* Set actual stack size to the given size. This sets st->size and + * st->bot. If not enough system memory is available, this can fail. + * Return 1 if successful, 0 if failed (in that case, st->size is not + * changed) */ +static int +pari_mainstack_setsize(struct pari_mainstack *st, size_t size) - { -- madvise(s, size, MADV_DONTNEED); ++{ + pari_sp newbot = st->top - size; + /* Align newbot to pagesize */ + pari_sp alignbot = newbot & ~(pari_sp)(PARI_STACK_ALIGN - 1); -+ /* Commit (make available) the virtual memory on the stack. */ -+ if (mprotect((void*)alignbot, st->top - alignbot, PROT_READ|PROT_WRITE)) ++ if (pari_mainstack_mextend(alignbot, st->top)) + { + /* Making the memory available did not work: limit vsize to the + * current actual stack size. */ @@ -72,29 +100,23 @@ index 439e279..be87a79 100644 + pari_warn(warnstack, st->vsize); + return 0; + } -+ /* Overwrite the existing mapping (MAP_FIXED) to discard it completely. -+ * Using PROT_NONE means that the memory is completely freed and that -+ * the kernel should not commit memory for it. -+ * -+ * NOTE: remapping with MAP_FIXED and PROT_NONE is not the same as -+ * calling mprotect(..., PROT_NONE) because the latter will keep the -+ * memory committed (this is in particular relevant on Linux with -+ * vm.overcommit = 2). This remains true even when calling -+ * madvise(..., MADV_DONTNEED). */ -+ mmap((void*)st->vbot, alignbot - st->vbot, PROT_NONE, -+ MAP_FIXED|MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); ++ pari_mainstack_mreset(st->vbot, alignbot); + st->bot = newbot; + st->size = size; + return 1; } #else -@@ -658,8 +684,13 @@ pari_mainstack_malloc(size_t s) - static void +@@ -614,7 +659,18 @@ static void pari_mainstack_mfree(void *s, size_t size) { (void) size; free(s); } --static void + static void -pari_mainstack_mreset(void *s, size_t size) { (void) s; (void) size; } ++pari_mainstack_mreset(pari_sp from, pari_sp to) { (void) from; (void) to; } ++ ++static int ++pari_mainstack_mextend(pari_sp from, pari_sp to) { (void) from; (void) to; return 0; } ++ +static int +pari_mainstack_setsize(struct pari_mainstack *st, size_t size) +{ @@ -105,7 +127,7 @@ index 439e279..be87a79 100644 #endif -@@ -688,9 +719,12 @@ pari_mainstack_alloc(struct pari_mainstack *st, size_t rsize, size_t vsize) +@@ -643,9 +699,12 @@ pari_mainstack_alloc(struct pari_mainstack *st, size_t rsize, size_t vsize) } st->vsize = vsize ? s: 0; st->rsize = minuu(rsize, s); @@ -120,7 +142,7 @@ index 439e279..be87a79 100644 st->memused = 0; } -@@ -699,7 +733,7 @@ pari_mainstack_free(struct pari_mainstack *st) +@@ -654,7 +713,7 @@ pari_mainstack_free(struct pari_mainstack *st) { pari_mainstack_mfree((void*)st->vbot, st->vsize ? st->vsize : fix_size(st->rsize)); st->top = st->bot = st->vbot = 0; @@ -129,13 +151,20 @@ index 439e279..be87a79 100644 } static void -@@ -768,27 +802,28 @@ paristack_resize(ulong newsize) +@@ -719,31 +778,47 @@ paristack_newrsize(ulong newsize) + void + paristack_resize(ulong newsize) + { +- size_t vsize = pari_mainstack->vsize; if (!newsize) - newsize = pari_mainstack->size << 1; - newsize = maxuu(minuu(newsize, vsize), pari_mainstack->size); +- newsize = pari_mainstack->size << 1; +- newsize = maxuu(minuu(newsize, vsize), pari_mainstack->size); - pari_mainstack->size = newsize; - pari_mainstack->bot = pari_mainstack->top - pari_mainstack->size; - pari_warn(warner,"increasing stack size to %lu",newsize); ++ newsize = 2 * pari_mainstack->size; ++ newsize = minuu(newsize, pari_mainstack->vsize); ++ if (newsize <= pari_mainstack->size) return; + if (pari_mainstack_setsize(pari_mainstack, newsize)) + { + pari_warn(warner, "increasing stack size to %lu", pari_mainstack->size); @@ -152,19 +181,57 @@ index 439e279..be87a79 100644 + pari_mainstack_setsize(pari_mainstack, pari_mainstack->rsize); } ++/* Enlarge the stack if needed such that the unused portion of the stack ++ * (between bot and avma) is large enough to contain x longs. */ void new_chunk_resize(size_t x) { - if (pari_mainstack->vsize==0 - || x > (avma-pari_mainstack->vbot) / sizeof(long)) pari_err(e_STACK); - while (x > (avma-pari_mainstack->bot) / sizeof(long)) -+ pari_sp bot; -+ while (bot = pari_mainstack->bot, x > (avma - bot) / sizeof(long)) +- paristack_resize(0); ++ ulong size, newsize, avail; ++ avail = (avma - pari_mainstack->bot) / sizeof(long); ++ if (avail >= x) return; ++ ++ /* We need to enlarge the stack. We try to at least double the ++ * stack, to avoid increasing the stack a lot of times by a small ++ * amount. */ ++ size = pari_mainstack->size; ++ newsize = size + maxuu((x - avail) * sizeof(long), size); ++ paristack_resize(newsize); ++ ++ /* Verify that we have enough space. Using a division here instead ++ * of a multiplication is safe against overflow. */ ++ avail = (avma - pari_mainstack->bot) / sizeof(long); ++ if (avail < x) + { - paristack_resize(0); -+ /* We did not manage to increase memory => error */ -+ if (pari_mainstack->bot == bot) pari_err(e_STACK); ++ /* Restore old size and error out */ ++ pari_mainstack_setsize(pari_mainstack, size); ++ pari_err(e_STACK); + } } /*********************************************************************/ +diff --git a/src/test/32/memory b/src/test/32/memory +new file mode 100644 +index 0000000..e865a17 +--- /dev/null ++++ b/src/test/32/memory +@@ -0,0 +1,8 @@ ++ *** Warning: new stack size = 1048576 (1.000 Mbytes). ++ *** at top-level: vector(100000,k,k) ++ *** ^-- ++ *** the PARI stack overflows ! ++ current stack size: 1048576 (1.000 Mbytes) ++ [hint] set 'parisizemax' to a non-zero value in your GPRC ++ ++Total time spent: 10 +diff --git a/src/test/in/memory b/src/test/in/memory +new file mode 100644 +index 0000000..2a36a9b +--- /dev/null ++++ b/src/test/in/memory +@@ -0,0 +1,2 @@ ++default(parisize, 2^20); ++vector(100000, k, k); \\ #1881 diff --git a/build/pkgs/pari/patches/prot_none_2.patch b/build/pkgs/pari/patches/prot_none_2.patch new file mode 100644 index 00000000000..6eb3a1b829e --- /dev/null +++ b/build/pkgs/pari/patches/prot_none_2.patch @@ -0,0 +1,25 @@ +commit 6942fab48aeb5aa5f4ea283b04951240a3139728 +Author: Karim Belabas +Date: Mon Jan 16 16:00:37 2017 +0100 + + remove useless definitions when ! HAS_MMAP + + pari_mainstack_mreset + pari_mainstack_mextend + +diff --git a/src/language/init.c b/src/language/init.c +index c7a90f0..64783be 100644 +--- a/src/language/init.c ++++ b/src/language/init.c +@@ -658,12 +658,6 @@ pari_mainstack_malloc(size_t s) + static void + pari_mainstack_mfree(void *s, size_t size) { (void) size; free(s); } + +-static void +-pari_mainstack_mreset(pari_sp from, pari_sp to) { (void) from; (void) to; } +- +-static int +-pari_mainstack_mextend(pari_sp from, pari_sp to) { (void) from; (void) to; return 0; } +- + static int + pari_mainstack_setsize(struct pari_mainstack *st, size_t size) + { diff --git a/build/pkgs/pari/patches/prot_none_3.patch b/build/pkgs/pari/patches/prot_none_3.patch new file mode 100644 index 00000000000..941dbf5edc2 --- /dev/null +++ b/build/pkgs/pari/patches/prot_none_3.patch @@ -0,0 +1,59 @@ +commit 845c0adf2be189702825a60304b79f21831cc7e0 +Author: Jeroen Demeyer +Date: Wed Jan 18 13:45:39 2017 +0000 + + Reset avma before calling parivstack_reset + +diff --git a/doc/usersch5.tex b/doc/usersch5.tex +index 58c7d04..6dc868c 100644 +--- a/doc/usersch5.tex ++++ b/doc/usersch5.tex +@@ -193,9 +193,12 @@ at most \kbd{parisizemax}. The stack content is not affected + by this operation. + + \fun{void}{parivstack_reset}{void} +-resets the current stack to its default size \kbd{parisize}, +-destroying its content. Used to recover memory after a +-computation that enlarged the stack. ++resets the current stack to its default size \kbd{parisize}. This is ++used to recover memory after a computation that enlarged the stack. ++This function destroys the content of the enlarged stack (between ++the old and the new bottom of the stack). ++Before calling this function, you must ensure that \kbd{avma} lies ++within the new smaller stack. + + \fun{void}{paristack_newrsize}{ulong newsize} + \emph{(does not return)}. Library version of +diff --git a/src/gp/gp.c b/src/gp/gp.c +index deaeec7..3463a2d 100644 +--- a/src/gp/gp.c ++++ b/src/gp/gp.c +@@ -360,7 +360,6 @@ gp_main_loop(long ismain) + if (ismain) continue; + pop_buffer(); return z; + } +- avma = av; + if (ismain) + { + reset_ctrlc(); +@@ -384,6 +383,7 @@ gp_main_loop(long ismain) + if (GP_DATA->simplify) z = simplify_shallow(z); + pari_add_hist(z, t); + if (z != gnil && ! is_silent(b->buf) ) gp_output(z); ++ avma = av; + parivstack_reset(); + } + } +diff --git a/src/language/init.c b/src/language/init.c +index 64783be..6c69c8e 100644 +--- a/src/language/init.c ++++ b/src/language/init.c +@@ -786,6 +786,8 @@ void + parivstack_reset(void) + { + pari_mainstack_setsize(pari_mainstack, pari_mainstack->rsize); ++ if (avma < pari_mainstack->bot) ++ pari_err_BUG("parivstack_reset [avma < bot]"); + } + + /* Enlarge the stack if needed such that the unused portion of the stack diff --git a/build/pkgs/pari/patches/stackwarn.patch b/build/pkgs/pari/patches/stackwarn.patch index b060a39ed92..718592bd205 100644 --- a/build/pkgs/pari/patches/stackwarn.patch +++ b/build/pkgs/pari/patches/stackwarn.patch @@ -1,14 +1,24 @@ -commit 7cf2260b69d3711f9292a3abab4d3a35d0c74059 +commit e5f592696f1cceab9d07e1b22b86067ea0fa8d09 Author: Jeroen Demeyer -Date: Thu Jan 14 10:13:39 2016 +0100 +Date: Fri Nov 4 12:37:38 2016 +0100 Use DEBUGMEM for stack size warnings -diff --git a/src/language/init.c b/src/language/init.c -index fa5c167..5cd1a13 100644 ---- a/src/language/init.c -+++ b/src/language/init.c -@@ -722,7 +722,8 @@ parivstack_resize(ulong newsize) +diff -ru src/src/gp/gp.c b/src/gp/gp.c +--- src/src/gp/gp.c 2017-01-30 17:36:54.045921458 +0100 ++++ b/src/gp/gp.c 2017-01-30 17:37:07.225921164 +0100 +@@ -559,6 +559,7 @@ + #endif + stdin_isatty = pari_stdin_isatty(); + pari_init_defaults(); ++ DEBUGMEM = 1; /* Use \gm1 by default in gp */ + pari_library_path = DL_DFLT_NAME; + pari_stack_init(&s_A,sizeof(*A),(void**)&A); + pari_init_opts(1000000 * sizeof(long), 0, INIT_SIGm | INIT_noPRIMEm | INIT_noIMTm); +diff -ru src/src/language/init.c b/src/language/init.c +--- src/src/language/init.c 2017-01-30 17:36:54.046921458 +0100 ++++ b/src/language/init.c 2017-01-30 17:37:07.227921164 +0100 +@@ -793,7 +793,8 @@ evalstate_reset(); paristack_setsize(pari_mainstack->rsize, newsize); s = pari_mainstack->vsize ? pari_mainstack->vsize : pari_mainstack->rsize; @@ -18,7 +28,7 @@ index fa5c167..5cd1a13 100644 pari_init_errcatch(); cb_pari_err_recover(-1); } -@@ -736,7 +737,8 @@ paristack_newrsize(ulong newsize) +@@ -807,7 +808,8 @@ pari_mainstack_resize(pari_mainstack, newsize, vsize); evalstate_reset(); s = pari_mainstack->rsize; @@ -28,8 +38,8 @@ index fa5c167..5cd1a13 100644 pari_init_errcatch(); cb_pari_err_recover(-1); } -@@ -750,7 +752,8 @@ paristack_resize(ulong newsize) - newsize = maxuu(minuu(newsize, vsize), pari_mainstack->size); +@@ -821,7 +823,8 @@ + if (newsize <= pari_mainstack->size) return; if (pari_mainstack_setsize(pari_mainstack, newsize)) { - pari_warn(warner, "increasing stack size to %lu", pari_mainstack->size); @@ -38,16 +48,3 @@ index fa5c167..5cd1a13 100644 } } -diff --git a/src/test/dotest b/src/test/dotest -index 3cb790d..6e4cc70 100755 ---- a/src/test/dotest -+++ b/src/test/dotest -@@ -86,7 +86,7 @@ for testdata in $testlist; do - for suf in $SUF; do - file_diff=$testname-$suf.dif - gp=$execdir/gp-$suf -- (echo 'gettime();0;'; cat $file_in; \ -+ (echo 'gettime();default(debugmem,1);'; cat $file_in; \ - echo 'print("Total time spent: ",gettime);') \ - | $RUNTEST $gp -q --test > $file_test 2>&1 - if test -n "$crlf"; then diff --git a/build/pkgs/pari_jupyter/checksums.ini b/build/pkgs/pari_jupyter/checksums.ini index 62c78967973..8c4503ffb22 100644 --- a/build/pkgs/pari_jupyter/checksums.ini +++ b/build/pkgs/pari_jupyter/checksums.ini @@ -1,4 +1,4 @@ -tarball=pari_jupyter-VERSION.tar.gz -sha1=234ddaa82b9229a83083f0ba4171acb801cc3a8d -md5=80ec021034affd77cebba79eb4bc4f83 -cksum=99491927 +tarball=pari_jupyter-VERSION.tar.bz2 +sha1=285acc6650ad177b092605938582e16d67e910bb +md5=ab0dc1d09303d33e861088155b82c965 +cksum=1154883481 diff --git a/build/pkgs/pari_jupyter/package-version.txt b/build/pkgs/pari_jupyter/package-version.txt index aabc6c3ebe5..23aa8390630 100644 --- a/build/pkgs/pari_jupyter/package-version.txt +++ b/build/pkgs/pari_jupyter/package-version.txt @@ -1 +1 @@ -1.1.0.p0 +1.2.2 diff --git a/build/pkgs/patchbot/SPKG.txt b/build/pkgs/patchbot/SPKG.txt deleted file mode 100644 index c34994b3818..00000000000 --- a/build/pkgs/patchbot/SPKG.txt +++ /dev/null @@ -1,26 +0,0 @@ -= SageMath patchbot = - -== Description == - -Apply branches and run tests on open Sage tickets. - -The patchbot is used to automate the testing of git branches. It has two -different aspects: a server side and a client side. - -Instructions for using the client side can be found at - -http://wiki.sagemath.org/buildbot/details - -== License == - -GPLv2+ - -== Upstream Contact == - -Robert Bradshaw -Frédéric Chapoton -https://github.com/robertwb/sage-patchbot/ - -== Dependencies == - -python, python-dateutil, sage-scripts diff --git a/build/pkgs/patchbot/checksums.ini b/build/pkgs/patchbot/checksums.ini deleted file mode 100644 index 02a49e870c8..00000000000 --- a/build/pkgs/patchbot/checksums.ini +++ /dev/null @@ -1,4 +0,0 @@ -tarball=patchbot-VERSION.tar.bz2 -sha1=bb80accde00279777934f7ab6f28b4789d94fbda -md5=3f6b9c30f0be34f03cce1520c4a5b8a9 -cksum=1882429436 diff --git a/build/pkgs/patchbot/dependencies b/build/pkgs/patchbot/dependencies deleted file mode 100644 index 4e1e0144211..00000000000 --- a/build/pkgs/patchbot/dependencies +++ /dev/null @@ -1 +0,0 @@ -# No dependencies diff --git a/build/pkgs/patchbot/package-version.txt b/build/pkgs/patchbot/package-version.txt deleted file mode 100644 index 35d16fb1a74..00000000000 --- a/build/pkgs/patchbot/package-version.txt +++ /dev/null @@ -1 +0,0 @@ -2.5.7 diff --git a/build/pkgs/patchbot/spkg-install b/build/pkgs/patchbot/spkg-install deleted file mode 100755 index 5dcc96f4629..00000000000 --- a/build/pkgs/patchbot/spkg-install +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -if [ "$SAGE_LOCAL" = "" ]; then - echo "SAGE_LOCAL undefined ... exiting"; - echo "Maybe run 'sage -sh'?" - exit 1 -fi - -# Delete any currently existing patchbot -rm -rf "$SAGE_LOCAL/bin/patchbot" - -# Copy into final location. -# The sage-patchbot script knows how to call this... -cp -Rv src "$SAGE_LOCAL/bin/patchbot" diff --git a/build/pkgs/perl_term_readline_gnu/spkg-install b/build/pkgs/perl_term_readline_gnu/spkg-install index f9c8c7dd1c9..8326aa6ac3d 100755 --- a/build/pkgs/perl_term_readline_gnu/spkg-install +++ b/build/pkgs/perl_term_readline_gnu/spkg-install @@ -8,5 +8,10 @@ fi cd src -perl Makefile.PL --prefix=$SAGE_LOCAL INSTALL_BASE=$SAGE_LOCAL +# In the configure phase, the package fails to use rpath for a test +# program that it compiles, causing a build failure on Linux as +# reported in #22505 (libreadline.so not found). We work around it by +# using LD_LIBRARY_PATH. +export LD_LIBRARY_PATH="$SAGE_LOCAL/lib":"$LD_LIBRARY_PATH" +perl Makefile.PL --prefix="$SAGE_LOCAL" INSTALL_BASE="$SAGE_LOCAL" $MAKE install diff --git a/build/pkgs/pillow/spkg-install b/build/pkgs/pillow/spkg-install index 1534fc027ed..80d39f5eb6d 100755 --- a/build/pkgs/pillow/spkg-install +++ b/build/pkgs/pillow/spkg-install @@ -14,6 +14,7 @@ rm -rf "$site_packages"/PIL "$site_packages"/PIL-*.egg* "$site_packages"/Pillow- # Note: Avoid shared libraries inside egg files, Trac #19467 python setup.py \ + --no-user-cfg \ build_ext \ --disable-jpeg \ install \ diff --git a/build/pkgs/pip/spkg-install b/build/pkgs/pip/spkg-install index d14544c765b..27f5a085842 100755 --- a/build/pkgs/pip/spkg-install +++ b/build/pkgs/pip/spkg-install @@ -5,4 +5,4 @@ cd src # pip can install itself! # need to use --upgrade or else pip, which is importing itself, will think # itself is already installed -python -m pip install --verbose --no-index --upgrade . +python -m pip install --verbose --no-index --upgrade --isolated . diff --git a/build/pkgs/planarity/SPKG.txt b/build/pkgs/planarity/SPKG.txt index 19d3ca23acb..e8991ac294f 100644 --- a/build/pkgs/planarity/SPKG.txt +++ b/build/pkgs/planarity/SPKG.txt @@ -17,7 +17,7 @@ New BSD License == Upstream Contact == -* https://code.google.com/p/planarity/ +* https://github.com/graph-algorithms/edge-addition-planarity-suite/ * John Boyer diff --git a/build/pkgs/pynac/checksums.ini b/build/pkgs/pynac/checksums.ini index 1ff30fe8e7a..0fc3153a9c9 100644 --- a/build/pkgs/pynac/checksums.ini +++ b/build/pkgs/pynac/checksums.ini @@ -1,4 +1,4 @@ tarball=pynac-VERSION.tar.bz2 -sha1=34b1d216069560e770b0be2c1298afdc8b2485e1 -md5=0aa0c115d7775f44a1d16b5418b06432 -cksum=2172592029 +sha1=915c0d0669a1a337eb06c0dbba4e4ea86e1f5c3d +md5=a076c6ae174b1d39662f8e775f4ffcf2 +cksum=85783609 diff --git a/build/pkgs/pynac/dependencies b/build/pkgs/pynac/dependencies index 4f7fb6c3cf7..7e5f11f9a8b 100644 --- a/build/pkgs/pynac/dependencies +++ b/build/pkgs/pynac/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) $(MP_LIBRARY) pkgconf flint singular +$(PYTHON) $(MP_LIBRARY) pkgconf flint singular giac ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/pynac/package-version.txt b/build/pkgs/pynac/package-version.txt index 7486fdbc50b..8bd6ba8c5c3 100644 --- a/build/pkgs/pynac/package-version.txt +++ b/build/pkgs/pynac/package-version.txt @@ -1 +1 @@ -0.7.2 +0.7.5 diff --git a/build/pkgs/pynac/patches/funcmap-fix.patch b/build/pkgs/pynac/patches/funcmap-fix.patch new file mode 100644 index 00000000000..b89d9447d43 --- /dev/null +++ b/build/pkgs/pynac/patches/funcmap-fix.patch @@ -0,0 +1,44 @@ +diff --git a/ginac/sum.cpp b/ginac/sum.cpp +index b65454d..ded81fd 100644 +--- a/ginac/sum.cpp ++++ b/ginac/sum.cpp +@@ -105,16 +105,17 @@ static ex falling_factorial_to_gamma(const function& f) + } + + using tgfun_t = decltype(gamma_to_gamma); +-static std::unordered_map funcmap {{ +- {factorial_SERIAL::serial, &factorial_to_gamma}, +- {tgamma_SERIAL::serial, &gamma_to_gamma}, +- {binomial_SERIAL::serial, &binomial_to_gamma}, +- {rising_factorial_SERIAL::serial, &rising_factorial_to_gamma}, +- {falling_factorial_SERIAL::serial, &falling_factorial_to_gamma}, +-}}; + + static bool has_suitable_form(ex the_ex) + { ++ static std::unordered_map funcmap {{ ++ {factorial_SERIAL::serial, &factorial_to_gamma}, ++ {tgamma_SERIAL::serial, &gamma_to_gamma}, ++ {binomial_SERIAL::serial, &binomial_to_gamma}, ++ {rising_factorial_SERIAL::serial, &rising_factorial_to_gamma}, ++ {falling_factorial_SERIAL::serial, &falling_factorial_to_gamma}, ++}}; ++ + if (is_rational_linear(the_ex)) + return true; + if (is_exactly_a(the_ex)) { +@@ -162,6 +163,14 @@ static bool has_suitable_form(ex the_ex) + + ex to_gamma(const ex& the_ex) + { ++ static std::unordered_map funcmap {{ ++ {factorial_SERIAL::serial, &factorial_to_gamma}, ++ {tgamma_SERIAL::serial, &gamma_to_gamma}, ++ {binomial_SERIAL::serial, &binomial_to_gamma}, ++ {rising_factorial_SERIAL::serial, &rising_factorial_to_gamma}, ++ {falling_factorial_SERIAL::serial, &falling_factorial_to_gamma}, ++}}; ++ + if (is_rational_linear(the_ex)) + return the_ex; + if (is_exactly_a(the_ex)) { diff --git a/build/pkgs/pynac/spkg-install b/build/pkgs/pynac/spkg-install index bc98795c8a2..c30545eddab 100755 --- a/build/pkgs/pynac/spkg-install +++ b/build/pkgs/pynac/spkg-install @@ -3,17 +3,13 @@ ## pynac ########################################### - -# The makefile system sets this variable, which screws up autoconf... -unset PYTHON - if [ "$SAGE_LOCAL" = "" ]; then echo "SAGE_LOCAL undefined ... exiting"; echo "Maybe run 'sage -sh'?" exit 1 fi -CXXFLAGS="-O2 -g" +export CXXFLAGS="-O2 -g $CXXFLAGS" if [ "$SAGE64" = "yes" ]; then echo "Building a 64-bit version of pynac" @@ -26,11 +22,6 @@ fi WORKDIR=${PWD}/src PYNACDIR=${WORKDIR} -patch() -{ - true -} - build_pynac() { cd ${PYNACDIR} @@ -64,8 +55,6 @@ clean_pynac() true } -patch - cd src diff --git a/build/pkgs/pysingular/SPKG.txt b/build/pkgs/pysingular/SPKG.txt new file mode 100644 index 00000000000..1517ebb2677 --- /dev/null +++ b/build/pkgs/pysingular/SPKG.txt @@ -0,0 +1,15 @@ += PySingular = + +== Description == + +A basic interface to call Singular from python + +This python module is meant to be used in Singulars Jupyter interface. + +== License == + +GPL version 2 or later + +== Upstream Contact == + +* https://github.com/sebasguts/SingularPython diff --git a/build/pkgs/pysingular/checksums.ini b/build/pkgs/pysingular/checksums.ini new file mode 100644 index 00000000000..db3da133e2f --- /dev/null +++ b/build/pkgs/pysingular/checksums.ini @@ -0,0 +1,4 @@ +tarball=PySingular-VERSION.tar.gz +sha1=eeec1551d62d8198e79fcbc2a11503569c69e6a4 +md5=be1913a73d6c5aaea7872202e55a4346 +cksum=3605640145 diff --git a/build/pkgs/pysingular/dependencies b/build/pkgs/pysingular/dependencies new file mode 100644 index 00000000000..142ad79d170 --- /dev/null +++ b/build/pkgs/pysingular/dependencies @@ -0,0 +1 @@ +$(PYTHON) singular | pip diff --git a/build/pkgs/pysingular/package-version.txt b/build/pkgs/pysingular/package-version.txt new file mode 100644 index 00000000000..f374f6662e9 --- /dev/null +++ b/build/pkgs/pysingular/package-version.txt @@ -0,0 +1 @@ +0.9.1 diff --git a/build/pkgs/pysingular/spkg-install b/build/pkgs/pysingular/spkg-install new file mode 100755 index 00000000000..c1a2289ade0 --- /dev/null +++ b/build/pkgs/pysingular/spkg-install @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +cd src && $PIP_INSTALL . diff --git a/build/pkgs/patchbot/type b/build/pkgs/pysingular/type similarity index 100% rename from build/pkgs/patchbot/type rename to build/pkgs/pysingular/type diff --git a/build/pkgs/python2/checksums.ini b/build/pkgs/python2/checksums.ini index 9120b6e1638..bbdd7d43c6b 100644 --- a/build/pkgs/python2/checksums.ini +++ b/build/pkgs/python2/checksums.ini @@ -1,4 +1,4 @@ tarball=Python-VERSION.tgz -sha1=1e80b781eacc6b7e243bd277e5002426aa56d0f1 -md5=88d61f82e3616a4be952828b3694109d -cksum=2292501105 +sha1=dce2b862a30099ee48c19a7c34e2d7c2eeff5670 +md5=17add4bf0ad0ec2f08e0cae6d205c700 +cksum=2666254648 diff --git a/build/pkgs/python2/package-version.txt b/build/pkgs/python2/package-version.txt index ab3a7bcd2f0..5f422b3f6ed 100644 --- a/build/pkgs/python2/package-version.txt +++ b/build/pkgs/python2/package-version.txt @@ -1 +1 @@ -2.7.12.p0 +2.7.13.p0 diff --git a/build/pkgs/python2/spkg-install b/build/pkgs/python2/spkg-install index bb923aa6670..cf28410a2cf 100755 --- a/build/pkgs/python2/spkg-install +++ b/build/pkgs/python2/spkg-install @@ -90,7 +90,7 @@ build() fi # Remove old libraries - rm -f "$SAGE_LOCAL"/lib/libpython* + rm -f "$SAGE_LOCAL"/lib/libpython2* # Running 'make install' in parallel is a bad idea, so we use # only 1 job. @@ -113,16 +113,18 @@ build() build -PYTHON_VERSION=$("$SAGE_LOCAL/bin/python" -c 'import sys; print("%d.%d" % sys.version_info[:2])') +PYTHON_VERSION=$("$SAGE_LOCAL/bin/python2" -c 'import sys; print("%d.%d" % sys.version_info[:2])') cd "$SAGE_LOCAL/lib" # Make symbolic link (after removing old link first) -rm -f python -ln -s python${PYTHON_VERSION} python -if [ $? -ne 0 ]; then - echo >&2 "Error creating symbolic link" - exit 1 +if [ "$SAGE_PYTHON3" != yes ]; then + rm -f python + ln -s python${PYTHON_VERSION} python + if [ $? -ne 0 ]; then + echo >&2 "Error creating symbolic link" + exit 1 + fi fi # On OS X with XCode 4, the presence of @@ -145,7 +147,7 @@ fi echo "Testing importing of various modules..." import_errors=false for module in ctypes math hashlib crypt readline socket ; do - if python -c "import $module"; then + if python2 -c "import $module"; then echo "$module module imported OK" else echo >&2 "$module module failed to import" @@ -154,7 +156,7 @@ for module in ctypes math hashlib crypt readline socket ; do done if [ "$UNAME" = "Darwin" ]; then - if python -c "import _scproxy"; then + if python2 -c "import _scproxy"; then echo "_scproxy module imported OK" else echo >&2 "_scproxy module failed to import" diff --git a/build/pkgs/python3/spkg-install b/build/pkgs/python3/spkg-install index c4cf8e4d21d..60679d1d513 100755 --- a/build/pkgs/python3/spkg-install +++ b/build/pkgs/python3/spkg-install @@ -68,7 +68,7 @@ build() fi # Remove old libraries - rm -f "$SAGE_LOCAL"/lib/libpython* + rm -f "$SAGE_LOCAL"/lib/libpython3* # Running 'make install' in parallel is a bad idea, so we use # only 1 job. @@ -93,14 +93,16 @@ build() build # Make symbolic link (after removing old link first) -rm -f "$SAGE_LOCAL/bin/python" -ln -s python3 "$SAGE_LOCAL/bin/python" -if [ $? -ne 0 ]; then - echo >&2 "Error creating symbolic link" - exit 1 +if [ "$SAGE_PYTHON3" = yes ]; then + rm -f "$SAGE_LOCAL/bin/python" + ln -s python3 "$SAGE_LOCAL/bin/python" + if [ $? -ne 0 ]; then + echo >&2 "Error creating symbolic link" + exit 1 + fi fi -PYTHON_VERSION=$("$SAGE_LOCAL/bin/python" -c 'import sys; print("%d.%d" % sys.version_info[:2])') +PYTHON_VERSION=$("$SAGE_LOCAL/bin/python3" -c 'import sys; print("%d.%d" % sys.version_info[:2])') # On OS X with XCode 4, the presence of # $SAGE_LOCAL/lib/python/config/libpython3.x.a causes problems with @@ -122,7 +124,7 @@ fi echo "Testing importing of various modules..." import_errors=false for module in ctypes math hashlib crypt readline socket ; do - if python -c "import $module"; then + if python3 -c "import $module"; then echo "$module module imported OK" else echo >&2 "$module module failed to import" diff --git a/build/pkgs/python3/type b/build/pkgs/python3/type index 9839eb20815..a6a7b9cd726 100644 --- a/build/pkgs/python3/type +++ b/build/pkgs/python3/type @@ -1 +1 @@ -experimental +standard diff --git a/build/pkgs/pyzmq/spkg-install b/build/pkgs/pyzmq/spkg-install index cb1c8e14808..e0ee9ad82fd 100755 --- a/build/pkgs/pyzmq/spkg-install +++ b/build/pkgs/pyzmq/spkg-install @@ -11,7 +11,10 @@ echo "[build_ext]" > src/setup.cfg echo "library_dirs = $SAGE_LOCAL/lib/" >> src/setup.cfg echo "include_dirs = $SAGE_LOCAL/include/" >> src/setup.cfg +echo "[configure]" >> src/setup.cfg +echo "zmq = $SAGE_LOCAL" >> src/setup.cfg + cd src # Configure and install -$PIP_INSTALL --global-option configure --global-option --zmq="$SAGE_LOCAL" . +$PIP_INSTALL . diff --git a/build/pkgs/scipy/spkg-install b/build/pkgs/scipy/spkg-install index f5075e81bf4..4984ee5cf47 100755 --- a/build/pkgs/scipy/spkg-install +++ b/build/pkgs/scipy/spkg-install @@ -26,6 +26,12 @@ fi # Make sure that the fortran objects are compiled with -fPIC export FFLAGS="$FFLAGS -fPIC" export FCFLAGS="$FCFLAGS -fPIC" +if [ "$UNAME" = "CYGWIN" -a "$SAGE_DEBUG" = "yes" ]; then + # Needed for just one or two modules when compiling in debug mode + # Otherwise the debug symbols create too many sections in the binary + export CPPFLAGS="$CPPFLAGS -Wa,-mbig-obj" +fi + # This avoids problems on some systems -- until we officially # support umfpack (which we will likely do, since cvxopt I think includes it): diff --git a/build/pkgs/scons/spkg-install b/build/pkgs/scons/spkg-install index 1ee7dd21617..7894cf2b79c 100755 --- a/build/pkgs/scons/spkg-install +++ b/build/pkgs/scons/spkg-install @@ -11,7 +11,7 @@ cd src/ rm -rf $SAGE_LOCAL/lib/scons-* # scons does not work with pip -python setup.py install +python setup.py --no-user-cfg install if [ $? -ne 0 ]; then echo "Error installing scons" diff --git a/build/pkgs/setuptools/checksums.ini b/build/pkgs/setuptools/checksums.ini index 5049b686155..60f6dfbab84 100644 --- a/build/pkgs/setuptools/checksums.ini +++ b/build/pkgs/setuptools/checksums.ini @@ -1,4 +1,4 @@ -tarball=setuptools-VERSION.tar.gz -sha1=7eac36b2ee70029ffbb3134d16894577635482ba -md5=8352a72cdebb6442f13ac6077db9c1ec -cksum=2631038083 +tarball=setuptools-VERSION.zip +sha1=617d3a5175b9bb048b5df95f6cca5fcd5226f82e +md5=7963d41d97b94e450e3f8a217be06ffe +cksum=4020461757 diff --git a/build/pkgs/setuptools/package-version.txt b/build/pkgs/setuptools/package-version.txt index a19540167eb..3d875153e8e 100644 --- a/build/pkgs/setuptools/package-version.txt +++ b/build/pkgs/setuptools/package-version.txt @@ -1 +1 @@ -24.0.2 +33.1.1 diff --git a/build/pkgs/setuptools/spkg-install b/build/pkgs/setuptools/spkg-install index 31b920e6b0a..e2cb14fe227 100755 --- a/build/pkgs/setuptools/spkg-install +++ b/build/pkgs/setuptools/spkg-install @@ -18,4 +18,4 @@ export PYTHON_EGG_CACHE="$DOT_SAGE/.python-eggs" cd src # Prevent setuptools from installing itself with easy_install -python setup.py install --single-version-externally-managed --record=/dev/null +python setup.py --no-user-cfg install --single-version-externally-managed --record=/dev/null diff --git a/build/pkgs/singular/checksums.ini b/build/pkgs/singular/checksums.ini index 5aaecf3241b..2fce3e6b89b 100644 --- a/build/pkgs/singular/checksums.ini +++ b/build/pkgs/singular/checksums.ini @@ -1,4 +1,4 @@ -tarball=singular-VERSION.tar.bz2 -sha1=faac6413b754da8c232ab1f7dcc8167e022a2c6f -md5=16f6986ede2704280bf96ff7e60c60b6 -cksum=2953942512 +tarball=singular-VERSION.tar.gz +sha1=f85ba08b4b676bbedbda74ef74a627e952e85e9d +md5=fee4999c27050ff2a0b8512ed59ac766 +cksum=3934325236 diff --git a/build/pkgs/singular/package-version.txt b/build/pkgs/singular/package-version.txt index e7e2cb9f3c3..bd2a330b800 100644 --- a/build/pkgs/singular/package-version.txt +++ b/build/pkgs/singular/package-version.txt @@ -1 +1 @@ -4.0.3p4 +4.1.0p1 diff --git a/build/pkgs/singular/patches/fgets.patch b/build/pkgs/singular/patches/fgets.patch new file mode 100644 index 00000000000..d4e42dcd512 --- /dev/null +++ b/build/pkgs/singular/patches/fgets.patch @@ -0,0 +1,22 @@ +Make sure Singular does not choke if its stdin gets closed. +diff --git a/kernel/oswrapper/feread.cc b/kernel/oswrapper/feread.cc +index 0513c9c..87b9214 100644 +--- a/kernel/oswrapper/feread.cc ++++ b/kernel/oswrapper/feread.cc +@@ -325,12 +325,13 @@ char * fe_fgets(const char *pr,char *s, int size) + /* NULL can mean various things... */ + switch(errno) + { +- case 0: return NULL; /*EOF */ ++ case 0: return NULL; /* EOF */ ++ case EBADF: return NULL; /* stdin got closed */ + case EINTR: return strcpy(s,"\n"); /* CTRL-C or other signal */ + default: /* other error */ + { +- int errsv = errno; +- fprintf(stderr,"fgets() failed with errno %d\n",errsv); ++ int errsv = errno; ++ fprintf(stderr,"fgets() failed with errno %d\n%s\n",errsv,strerror(errsv)); + return NULL; + } + } diff --git a/build/pkgs/singular/patches/grobner.patch b/build/pkgs/singular/patches/grobner.patch new file mode 100644 index 00000000000..1992c619757 --- /dev/null +++ b/build/pkgs/singular/patches/grobner.patch @@ -0,0 +1,22 @@ +From 589e8eab0d5415b844ad43ec150a72e4004e1114 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hans=20Sch=C3=B6nemann?= +Date: Wed, 21 Dec 2016 19:00:51 +0100 +Subject: [PATCH] fix: charstr in standard::groebner for ZZ, ZZ/m + +--- + Singular/LIB/standard.lib | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Singular/LIB/standard.lib b/Singular/LIB/standard.lib +index d657b98..f7ee564 100644 +--- a/Singular/LIB/standard.lib ++++ b/Singular/LIB/standard.lib +@@ -881,7 +881,7 @@ EXAMPLE: example groebner; shows an example" + else {ideal i=i_par; } // int, poly, number, ideal + kill i_par; + // check for integer etc coefficients +- if (charstr(basering)[1]=="i") // either integer or integer,q ++ if (attrib(basering,"ring_cf")==1) // either integer or integer,q + { + if (find(option(),"prot")) { "calling std for ideals in ring with ring coefficients"; } + return (std(i)); diff --git a/build/pkgs/singular/patches/libnamebuf_length.patch b/build/pkgs/singular/patches/libnamebuf_length.patch new file mode 100644 index 00000000000..9b81b5151fe --- /dev/null +++ b/build/pkgs/singular/patches/libnamebuf_length.patch @@ -0,0 +1,97 @@ +Increase the hardcoded library file name buffer size + +See https://trac.sagemath.org/ticket/22175 + +--- +diff --git a/Singular/fehelp.cc b/Singular/fehelp.cc +index df00135..2fb2f5d 100644 +--- a/Singular/fehelp.cc ++++ b/Singular/fehelp.cc +@@ -702,7 +702,7 @@ static BOOLEAN heOnlineHelp(char* s) + return FALSE; + } + +- char libnamebuf[128]; ++ char libnamebuf[1024]; + FILE *fp=NULL; + // first, search for library of that name + if ((str[1]!='\0') && +diff --git a/Singular/iparith.cc b/Singular/iparith.cc +index 9843bb1..a1472e8 100644 +--- a/Singular/iparith.cc ++++ b/Singular/iparith.cc +@@ -5193,7 +5193,7 @@ BOOLEAN jjWAITALL1(leftv res, leftv u) + + BOOLEAN jjLOAD(const char *s, BOOLEAN autoexport) + { +- char libnamebuf[256]; ++ char libnamebuf[1024]; + lib_types LT = type_of_LIB(s, libnamebuf); + + #ifdef HAVE_DYNAMIC_LOADING +@@ -5228,7 +5228,7 @@ BOOLEAN jjLOAD(const char *s, BOOLEAN autoexport) + package savepack=currPack; + currPack=IDPACKAGE(pl); + IDPACKAGE(pl)->loaded=TRUE; +- char libnamebuf[256]; ++ char libnamebuf[1024]; + FILE * fp = feFopen( s, "r", libnamebuf, TRUE ); + BOOLEAN bo=iiLoadLIB(fp, libnamebuf, s, pl, autoexport, TRUE); + currPack=savepack; +diff --git a/Singular/iplib.cc b/Singular/iplib.cc +index a0fdff9..2bd6e7b 100644 +--- a/Singular/iplib.cc ++++ b/Singular/iplib.cc +@@ -656,7 +656,7 @@ iiGetBuiltinModInit(const char* libname) + BOOLEAN iiTryLoadLib(leftv v, const char *id) + { + BOOLEAN LoadResult = TRUE; +- char libnamebuf[128]; ++ char libnamebuf[1024]; + char *libname = (char *)omAlloc(strlen(id)+5); + const char *suffix[] = { "", ".lib", ".so", ".sl", NULL }; + int i = 0; +@@ -672,7 +672,7 @@ BOOLEAN iiTryLoadLib(leftv v, const char *id) + { + char *s=omStrDup(libname); + #ifdef HAVE_DYNAMIC_LOADING +- char libnamebuf[256]; ++ char libnamebuf[1024]; + #endif + + if (LT==LT_SINGULAR) +@@ -717,7 +717,7 @@ BOOLEAN iiLocateLib(const char* lib, char* where) + + BOOLEAN iiLibCmd( char *newlib, BOOLEAN autoexport, BOOLEAN tellerror, BOOLEAN force ) + { +- char libnamebuf[128]; ++ char libnamebuf[1024]; + // procinfov pi; + // idhdl h; + idhdl pl; +diff --git a/Singular/libparse.cc b/Singular/libparse.cc +index 333999f..b468ed1 100644 +--- a/Singular/libparse.cc ++++ b/Singular/libparse.cc +@@ -1093,7 +1093,7 @@ BOOLEAN p_static = FALSE; + int old_state = 0; + lib_cmds last_cmd = LP_NONE; + +-char libnamebuf[128]; ++char libnamebuf[1024]; + char *text_buffer=NULL; + long string_start; + +diff --git a/Singular/libparse.ll b/Singular/libparse.ll +index 3cd7abc..f85bb3b 100644 +--- a/Singular/libparse.ll ++++ b/Singular/libparse.ll +@@ -44,7 +44,7 @@ BOOLEAN p_static = FALSE; + int old_state = 0; + lib_cmds last_cmd = LP_NONE; + +-char libnamebuf[128]; ++char libnamebuf[1024]; + char *text_buffer=NULL; + long string_start; + diff --git a/build/pkgs/singular/patches/nfCoeffName.patch b/build/pkgs/singular/patches/nfCoeffName.patch new file mode 100644 index 00000000000..a1d6b9c4503 --- /dev/null +++ b/build/pkgs/singular/patches/nfCoeffName.patch @@ -0,0 +1,37 @@ +From 61e85543ff6e6160d3d8c6b8fba50eb327f41679 Mon Sep 17 00:00:00 2001 +From: Hans Schoenemann +Date: Mon, 5 Dec 2016 10:13:42 +0100 +Subject: [PATCH] add: nfCoeffString (ffields.cc) + +--- + libpolys/coeffs/ffields.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/libpolys/coeffs/ffields.cc b/libpolys/coeffs/ffields.cc +index b43162b..885dac6 100644 +--- a/libpolys/coeffs/ffields.cc ++++ b/libpolys/coeffs/ffields.cc +@@ -826,6 +826,15 @@ static char* nfCoeffString(const coeffs r) + return s; + } + ++static char nfCoeffName_buf[32]; ++static char* nfCoeffName(const coeffs r) ++{ ++ const char *p=n_ParameterNames(r)[0]; ++ nfCoeffName_buf[31]='\0'; ++ snprintf(nfCoeffName_buf,31,"ZZ/%ds[%s]",r->m_nfCharQ,p); ++ return nfCoeffName_buf; ++} ++ + static number nfRandom(siRandProc p,number ,number, const coeffs cf) + { + return (number)(long)(p() %(cf->m_nfCharQ+1)); +@@ -840,6 +849,7 @@ BOOLEAN nfInitChar(coeffs r, void * parameter) + r->cfKillChar=nfKillChar; + r->nCoeffIsEqual=nfCoeffIsEqual; + r->cfCoeffString=nfCoeffString; ++ r->cfCoeffName=nfCoeffName; + + r->cfMult = nfMult; + r->cfSub = nfSub; diff --git a/build/pkgs/singular/patches/nrnCoeffName.patch b/build/pkgs/singular/patches/nrnCoeffName.patch new file mode 100644 index 00000000000..3ceb91e278c --- /dev/null +++ b/build/pkgs/singular/patches/nrnCoeffName.patch @@ -0,0 +1,45 @@ +From 3f7f11c9a4692a3c651413c8cd45f6c9f01960d9 Mon Sep 17 00:00:00 2001 +From: Hans Schoenemann +Date: Sat, 3 Dec 2016 16:17:38 +0100 +Subject: [PATCH] add: nrnCoeffName for rmodulon.cc + +--- + libpolys/coeffs/rmodulon.cc | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/libpolys/coeffs/rmodulon.cc b/libpolys/coeffs/rmodulon.cc +index e2b55bd..80258e8 100644 +--- a/libpolys/coeffs/rmodulon.cc ++++ b/libpolys/coeffs/rmodulon.cc +@@ -86,6 +86,23 @@ void nrnCoeffWrite (const coeffs r, BOOLEAN /*details*/) + omFreeSize((ADDRESS)s, l); + } + ++static char* nrnCoeffName_buff=NULL; ++static char* nrnCoeffName(const coeffs r) ++{ ++ if(nrnCoeffName_buff==NULL) omFree(nrnCoeffName_buff); ++ size_t l = (size_t)mpz_sizeinbase(r->modBase, 10) + 2; ++ nrnCoeffName_buff=(char*)omAlloc(l+6); ++ char* s = (char*) omAlloc(l); ++ s= mpz_get_str (s, 10, r->modBase); ++ if (nCoeff_is_Ring_ModN(r)) ++ snprintf(nrnCoeffName_buff,l+6,"ZZ/%s",s); ++ else if (nCoeff_is_Ring_PtoM(r)) ++ snprintf(nrnCoeffName_buff,l+6,"ZZ/%s^lu",s,r->modExponent); ++ omFreeSize((ADDRESS)s, l); ++ return nrnCoeffName_buff; ++} ++ ++ + static BOOLEAN nrnCoeffsEqual(const coeffs r, n_coeffType n, void * parameter) + { + /* test, if r is an instance of nInitCoeffs(n,parameter) */ +@@ -213,6 +230,7 @@ BOOLEAN nrnInitChar (coeffs r, void* p) + r->cfExtGcd = nrnExtGcd; + r->cfXExtGcd = nrnXExtGcd; + r->cfQuotRem = nrnQuotRem; ++ r->cfCoeffName = nrnCoeffName; + r->cfCoeffWrite = nrnCoeffWrite; + r->nCoeffIsEqual = nrnCoeffsEqual; + r->cfKillChar = nrnKillChar; diff --git a/build/pkgs/singular/patches/ntl10.patch b/build/pkgs/singular/patches/ntl10.patch deleted file mode 100644 index 78cec88d873..00000000000 --- a/build/pkgs/singular/patches/ntl10.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 861b7899904e3bbe3e8fe49fc0dd11ef9f5f238e Mon Sep 17 00:00:00 2001 -From: Hans Schoenemann -Date: Wed, 19 Oct 2016 12:20:04 +0200 -Subject: [PATCH] fix: NTL <-> factory: port to NTL 10.1 - ---- - factory/NTLconvert.cc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/latest/factory/NTLconvert.cc b/latest/factory/NTLconvert.cc -index 5e095d3..b48df10 100644 ---- a/latest/factory/NTLconvert.cc -+++ b/latest/factory/NTLconvert.cc -@@ -505,8 +505,10 @@ convertZZ2CF (const ZZ & a) - const long * rep = - #if NTL_MAJOR_VERSION <= 6 - static_cast( a.rep ); --#else -+#elif NTL_MAJOR_VERSION <=9 - static_cast( a.rep.rep ); // what about NTL7? -+#else -+ (long*)( a.rep.rep ); - #endif - long sizeofrep= rep[1]; - bool lessZero= false; -@@ -547,7 +549,6 @@ convertZZ2CF (const ZZ & a) - - result= CanonicalForm (cf_stringtemp2, 16); - delete [] cf_stringtemp2; -- return result; - } - return result; - } diff --git a/build/pkgs/singular/patches/xalloc_unused.patch b/build/pkgs/singular/patches/xalloc_unused.patch new file mode 100644 index 00000000000..093a8ffccee --- /dev/null +++ b/build/pkgs/singular/patches/xalloc_unused.patch @@ -0,0 +1,28 @@ +commit 67e67da7e75dd2a71a25010346c18f728afb4a77 +Author: Jean-Pierre Flori +Date: Tue Dec 20 09:43:03 2016 +0000 + + Mark unused params as unused to get rid of compiler warnings. + +diff --git a/xalloc/omalloc.h b/xalloc/omalloc.h +index 80ae08d..473277d 100644 +--- a/xalloc/omalloc.h ++++ b/xalloc/omalloc.h +@@ -86,7 +86,7 @@ static inline void *omRealloc(void *d, size_t ns) + } + } + #define omReallocAligned(A,B) omRealloc(A,B) +-static inline void *omReallocSize(void *d, size_t os, size_t ns) ++static inline void *omReallocSize(void *d, __attribute__((unused)) size_t os, size_t ns) + { if (d==NULL) return omAlloc(ns); + else + { +@@ -113,7 +113,7 @@ static inline void *omRealloc0(void *d, size_t ns) + } + return n; + } +-static inline void omFreeSize(void *d, size_t s) ++static inline void omFreeSize(void *d, __attribute__((unused)) size_t s) + { if (d!=NULL) { long *dd=(long*)d; dd--; free(dd);}} + + static inline char * omStrDup(const char *s) diff --git a/build/pkgs/singular/spkg-check b/build/pkgs/singular/spkg-check new file mode 100755 index 00000000000..2eb766a5678 --- /dev/null +++ b/build/pkgs/singular/spkg-check @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + + +Singular -c 'LIB "freegb.lib"; exit;' +if [ $? -ne 0 ]; then + echo >&2 "Error loading the freegb library in Singular." + exit 1 +fi diff --git a/build/pkgs/singular/spkg-install b/build/pkgs/singular/spkg-install index 91d2e9d1ce4..373bd0852b2 100755 --- a/build/pkgs/singular/spkg-install +++ b/build/pkgs/singular/spkg-install @@ -10,11 +10,7 @@ if [ -z "$SAGE_LOCAL" ]; then exit 1 fi -cd src - -SRC=`pwd`/latest -SHARED=`pwd`/shared - +SRC=`pwd`/src cd "$SRC" if [ "x$SAGE_DEBUG" = "xyes" ]; then @@ -77,6 +73,7 @@ remove_old_version() rm -f "$SAGE_LOCAL"/lib/libresources* rm -r "$SAGE_LOCAL"/lib/libgfan* rm -rf "$SAGE_LOCAL/share/singular" + rm -f "$SAGE_LOCAL"/share/info/singular* } config() @@ -124,13 +121,6 @@ build_singular() } -install_docs() -{ - cd "$SHARED" - $CP -p singular.hlp singular.idx "$SAGE_LOCAL/share/singular/" -} - - fix_includes() { # Fix all Singular includes to work from local/include @@ -150,8 +140,7 @@ fix_includes() # Actually run all the functions defined above for i in remove_old_version config \ - build_singular fix_includes \ - install_docs ; do + build_singular fix_includes ; do echo "############### Singular stage $i ###############" cd "$SRC" && $i done diff --git a/build/pkgs/singular/spkg-src b/build/pkgs/singular/spkg-src deleted file mode 100755 index 39ce96c6f5b..00000000000 --- a/build/pkgs/singular/spkg-src +++ /dev/null @@ -1,110 +0,0 @@ -#!/usr/bin/env bash - -if [ "$SAGE_DISTFILES" = "" ]; then - echo >&2 "SAGE_DISTFILES undefined ... exiting"; - echo >&2 "Maybe run 'sage -sh'?" - exit 1 -fi - -if [ $# -ne 0 ]; then - UPSTREAM_SOURCE_DIRECTORY=`cd "$1" && pwd -P` - echo "Using tarballs from $UPSTREAM_SOURCE_DIRECTORY instead of downloading" -fi - -set -e -umask 0022 - - -SAGEVERSION=`cat $(dirname "$0")/package-version.txt` -VERSION=`echo "$SAGEVERSION" | sed 's/[.]p[0-9]*$//'` -PKGNAME="singular-$VERSION" -DOTVERSION=`echo "$VERSION" | sed 's/p.*//'` -DASHVERSION=`echo "$DOTVERSION" | sed 's/[.]/-/g'` -TARBALL_SRC="singular-${VERSION}.tar.gz" -TARBALL_SHR="singular-${DOTVERSION}-share.tar.gz" -TARGET="$SAGE_DISTFILES/$PKGNAME.tar.bz2" - -echo >&2 "Creating tarball $TARGET..." - -# Remove old sources and download new -SPKG_ROOT="$SAGE_ROOT/local/var/tmp/singular" - -rm -rf "$SPKG_ROOT" -mkdir -p "$SPKG_ROOT/$PKGNAME" -cd "$SPKG_ROOT/$PKGNAME" - -URL="http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/$DASHVERSION" -if [ -z "$UPSTREAM_SOURCE_DIRECTORY" ]; then - if [ -z "$SINGULAR_GIT_COMMIT" ]; then - tar xzf <( curl -L "$URL/$TARBALL_SRC" ) - else - git clone https://github.com/Singular/Sources/ singular.git - cd singular.git - # The following is inspired from make_tar.sh - #sh make_tar.sh - #begin make_tar.sh - git checkout "$SINGULAR_GIT_COMMIT" - git checkout-index -a -f --prefix=singular-$DOTVERSION/ - rm singular-$DOTVERSION/.gdbinit singular-$DOTVERSION/*/.gdbinit singular-$DOTVERSION/*/*/.gdbinit singular-$DOTVERSION/*/*/*/.gdbinit - rm singular-$DOTVERSION/IntegerProgramming/README - rm -rf singular-$DOTVERSION/modules - rm -rf singular-$DOTVERSION/factory/old - cd singular-$DOTVERSION - autoreconf -fiv - cd .. - rm -rf singular-$DOTVERSION/autom4te.cache - rm -rf singular-$DOTVERSION/*/autom4te.cache - rm -rf singular-$DOTVERSION/*/*/autom4te.cache - rm -rf singular-$DOTVERSION/omalloc/Misc - rm -rf singular-$DOTVERSION/Singular/LIB/surfex - rm -rf singular-$DOTVERSION/Singular/cnf2ideal.py - rm -rf singular-$DOTVERSION/kernel/old singular-$DOTVERSION/kernel/sample - rm -rf singular-$DOTVERSION/dox/Doxyfile.html.all singular-$DOTVERSION/dox/Doxyfile.in1 singular-$DOTVERSION/dox/Doxyfile.latex.short singular-$DOTVERSION/dox/readme - rm -rf singular-$DOTVERSION/factory/ConwayList.txt - rm -rf singular-$DOTVERSION/logo singular-$DOTVERSION/standalone.test singular-$DOTVERSION/templates singular-$DOTVERSION/tests - #end make_tar.sh - mv singular-$DOTVERSION ../ - cd .. - rm -rf singular.git - fi - tar xzf <( curl -L "$URL/$TARBALL_SHR" ) -else - tar xzf "$UPSTREAM_SOURCE_DIRECTORY/$TARBALL_SRC" - tar xzf "$UPSTREAM_SOURCE_DIRECTORY/$TARBALL_SHR" -fi - -# Make everything writable -chmod -R u+w * - -### Sanitize upstream shared (documentation) dir -if [ ! -d share/singular ]; then - echo "Singular directory not in Singular shared tarball, aborting" - exit 1 -fi -mkdir shared -mv "share/singular/singular.idx" shared/ -mv "share/info/singular.hlp" shared/ -rm -r share - - -# Sanitize upstream sources -if [ ! -d "singular-$DOTVERSION" ]; then - echo "singular-$DOTVERSION directory not in Singular tarball, aborting" - exit 1 -fi -mv "singular-$DOTVERSION" latest - -# Touch autotools files to make sure nothing gets autoregenerated during make -# It indeed seems autotools leave them in a broken state -cd latest -touch configure.ac aclocal.m4 configure Makefile.am Makefile.in _config.h.in -touch */configure.ac */aclocal.m4 */configure */Makefile.am */Makefile.in */_config.h.in -cd .. - -### Create actual upstream package -cd "$SPKG_ROOT" -tar c "$PKGNAME" | bzip2 -c --best >"$TARGET" -cd "$SAGE_ROOT" -rm -rf "$SPKG_ROOT" - -echo "Now run 'sage --package fix-checksum singular'" diff --git a/build/pkgs/singular_jupyter/SPKG.txt b/build/pkgs/singular_jupyter/SPKG.txt new file mode 100644 index 00000000000..ced40f28a9e --- /dev/null +++ b/build/pkgs/singular_jupyter/SPKG.txt @@ -0,0 +1,15 @@ += jupyter-kernel-singular = + +== Description == + +A Jupyter kernel for singular + +This is a beta version of a jupyter kernel for Singular. + +== License == + +GPL version 2 or later + +== Upstream Contact == + +* https://github.com/sebasguts/jupyter_kernel_singular diff --git a/build/pkgs/singular_jupyter/checksums.ini b/build/pkgs/singular_jupyter/checksums.ini new file mode 100644 index 00000000000..9610c182c79 --- /dev/null +++ b/build/pkgs/singular_jupyter/checksums.ini @@ -0,0 +1,4 @@ +tarball=jupyter_kernel_singular-VERSION.tar.gz +sha1=381319a1a49c4565078392bcd65b306f2dc22707 +md5=915e2e89b759297a8aebcfe8ca400cbb +cksum=3440281746 diff --git a/build/pkgs/singular_jupyter/dependencies b/build/pkgs/singular_jupyter/dependencies new file mode 100644 index 00000000000..1113df615a6 --- /dev/null +++ b/build/pkgs/singular_jupyter/dependencies @@ -0,0 +1 @@ +$(PYTHON) jupyter_client | pip pysingular ipython ipywidgets diff --git a/build/pkgs/singular_jupyter/package-version.txt b/build/pkgs/singular_jupyter/package-version.txt new file mode 100644 index 00000000000..2003b639c40 --- /dev/null +++ b/build/pkgs/singular_jupyter/package-version.txt @@ -0,0 +1 @@ +0.9.2 diff --git a/build/pkgs/singular_jupyter/spkg-install b/build/pkgs/singular_jupyter/spkg-install new file mode 100755 index 00000000000..c1a2289ade0 --- /dev/null +++ b/build/pkgs/singular_jupyter/spkg-install @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +cd src && $PIP_INSTALL . diff --git a/build/pkgs/singular_jupyter/type b/build/pkgs/singular_jupyter/type new file mode 100644 index 00000000000..134d9bc32d5 --- /dev/null +++ b/build/pkgs/singular_jupyter/type @@ -0,0 +1 @@ +optional diff --git a/build/pkgs/surf/SPKG.txt b/build/pkgs/surf/SPKG.txt new file mode 100644 index 00000000000..4967aa2cc72 --- /dev/null +++ b/build/pkgs/surf/SPKG.txt @@ -0,0 +1,33 @@ += surf = + +== Description == + +surf is a tool to visualize some real algebraic geometry: plane algebraic +curves, algebraic surfaces and hyperplane sections of surfaces. surf is script +driven and has (optionally) a nifty GUI using the Gtk widget set. + +This is used by the Singular Jupyter kernel to produce 3D plots. + +== License == + +GPL version 2 or later + +== Upstream Contact == + +http://surf.sourceforge.net +(although the project is essentially dead) + +== Dependencies == + +* cups (optional) +* GNU flex Version 2.5 or higher +* GTK+ Version 1.2.0 or higher (optional) +* POSIX Threads +* GNU MP(gmp) Version 2 or higher +* lib-tiff +* lib-jpeg +* zlib +* ps2pdf (optional) + +This package is "experimental" because not all of these dependencies are +packaged with Sage. diff --git a/build/pkgs/surf/checksums.ini b/build/pkgs/surf/checksums.ini new file mode 100644 index 00000000000..8d9fde8d4f7 --- /dev/null +++ b/build/pkgs/surf/checksums.ini @@ -0,0 +1,4 @@ +tarball=surf-VERSION.tar.gz +sha1=570dc2ab09619a907d2f6a142b0d268082cfc003 +md5=ca1a57804cc6efc7d14f285d54119b33 +cksum=2431066768 diff --git a/build/pkgs/surf/dependencies b/build/pkgs/surf/dependencies new file mode 100644 index 00000000000..9a77ea16f78 --- /dev/null +++ b/build/pkgs/surf/dependencies @@ -0,0 +1,5 @@ +$(MP_LIBRARY) + +---------- +All lines of this file are ignored except the first. +It is copied by SAGE_ROOT/build/make/install into SAGE_ROOT/build/make/Makefile. diff --git a/build/pkgs/surf/package-version.txt b/build/pkgs/surf/package-version.txt new file mode 100644 index 00000000000..d83f38e2102 --- /dev/null +++ b/build/pkgs/surf/package-version.txt @@ -0,0 +1 @@ +1.0.6-gcc6 diff --git a/build/pkgs/surf/spkg-install b/build/pkgs/surf/spkg-install new file mode 100755 index 00000000000..78b1ce451ec --- /dev/null +++ b/build/pkgs/surf/spkg-install @@ -0,0 +1,14 @@ +#!/bin/sh + +if [ -z "$SAGE_LOCAL" ]; then + echo >&2 "SAGE_LOCAL undefined ... exiting" + echo >&2 "Maybe run 'sage --sh'?" + exit 1 +fi + +set -e + +cd src +./configure --prefix="$SAGE_LOCAL" --disable-gui --disable-cups +$MAKE +$MAKE install diff --git a/build/pkgs/surf/type b/build/pkgs/surf/type new file mode 100644 index 00000000000..9839eb20815 --- /dev/null +++ b/build/pkgs/surf/type @@ -0,0 +1 @@ +experimental diff --git a/build/pkgs/threejs/SPKG.txt b/build/pkgs/threejs/SPKG.txt index 31d2fc42118..57052228b76 100644 --- a/build/pkgs/threejs/SPKG.txt +++ b/build/pkgs/threejs/SPKG.txt @@ -2,7 +2,7 @@ == Description == -Three.js is a javascript library to display 3-d graphics in the browser. +Three.js is a JavaScript library to display 3D graphics in the browser. == License == diff --git a/build/pkgs/threejs/checksums.ini b/build/pkgs/threejs/checksums.ini index e9d8e598bcb..f3a6afd0d6b 100644 --- a/build/pkgs/threejs/checksums.ini +++ b/build/pkgs/threejs/checksums.ini @@ -1,4 +1,4 @@ tarball=threejs-VERSION.tar.gz -sha1=274f03baabe81dbc90ba64a8883c395a2425b649 -md5=afae707a2e79d2c85cee1132b0bf3bd2 -cksum=1616666612 +sha1=832344b9cdf6856780873eb72d026b513a32706e +md5=f153c90e4b1b5eb47e4bae16de6645f7 +cksum=3051277618 diff --git a/build/pkgs/threejs/package-version.txt b/build/pkgs/threejs/package-version.txt index 41ab1704588..9312a7e53a7 100644 --- a/build/pkgs/threejs/package-version.txt +++ b/build/pkgs/threejs/package-version.txt @@ -1 +1 @@ -r70 +r80 diff --git a/build/pkgs/threejs/spkg-install b/build/pkgs/threejs/spkg-install index 63ddcdc4868..829a8b805c3 100755 --- a/build/pkgs/threejs/spkg-install +++ b/build/pkgs/threejs/spkg-install @@ -11,4 +11,3 @@ fi TARGET="${SAGE_SHARE}/threejs" rm -rf "${TARGET}" cp -r 'src' "${TARGET}" - diff --git a/build/pkgs/threejs/spkg-src b/build/pkgs/threejs/spkg-src index 9f43ad9d416..96dcf199703 100755 --- a/build/pkgs/threejs/spkg-src +++ b/build/pkgs/threejs/spkg-src @@ -1,33 +1,30 @@ #!/usr/bin/env bash set -e -shopt -s extglob -GIT_VERSION=r70 +GIT_VERSION=r80 [ -n "${SAGE_ROOT}" ] || SAGE_ROOT="$(pwd)/../../../" -# fetch and rename latest version. -URL="https://github.com/mrdoob/three.js/archive/${GIT_VERSION}.tar.gz" -echo "Downloading $URL" -rm -rf src -if [ -z "$UPSTREAM_SOURCE_TARBALL" ]; then - tar xzf <( curl -L "$URL" ) -else - tar xzf "$UPSTREAM_SOURCE_TARBALL" -fi -mv three.js-${GIT_VERSION} src +# Fetch latest version. +URL1="https://raw.githubusercontent.com/mrdoob/three.js/${GIT_VERSION}/build/three.min.js" +echo "Downloading $URL1" +curl -OL "$URL1" -# Delete the 200mb of enclosed examples -# However, keep the examples/js directory (see Trac #17823) -rm -rf src/examples/!(js) +URL2="https://raw.githubusercontent.com/mrdoob/three.js/${GIT_VERSION}/examples/js/controls/OrbitControls.js" +echo "Downloading $URL2" +curl -OL "$URL2" -# repack -tar czf "$SAGE_ROOT/upstream/threejs-${GIT_VERSION}.tar.gz" src -rm -rf src +URL3="https://raw.githubusercontent.com/mrdoob/three.js/${GIT_VERSION}/LICENSE" +echo "Downloading $URL3" +curl -OL "$URL3" -# update package info +# Package +tar czf "$SAGE_ROOT/upstream/threejs-${GIT_VERSION}.tar.gz" 'three.min.js' 'OrbitControls.js' 'LICENSE' +rm -rf 'three.min.js' 'OrbitControls.js' 'LICENSE' + +# Update package info echo "${GIT_VERSION}" > 'package-version.txt' -"$SAGE_ROOT"/sage -sh 'sage-fix-pkg-checksums' +"$SAGE_ROOT"/sage --package fix-checksum diff --git a/build/pkgs/threejs/type b/build/pkgs/threejs/type index 134d9bc32d5..a6a7b9cd726 100644 --- a/build/pkgs/threejs/type +++ b/build/pkgs/threejs/type @@ -1 +1 @@ -optional +standard diff --git a/build/pkgs/traitlets/checksums.ini b/build/pkgs/traitlets/checksums.ini index 85a7e935f8e..b5b8555a468 100644 --- a/build/pkgs/traitlets/checksums.ini +++ b/build/pkgs/traitlets/checksums.ini @@ -1,4 +1,4 @@ tarball=traitlets-VERSION.tar.gz -sha1=c1bb59bbe9424fd4f3ad8363f5f53c42ecdde7e1 -md5=d0725f9818bd9e112a6531da26d433b8 -cksum=3725637001 +sha1=fa5ff17a5a57d23626dab85f932c711b16407d89 +md5=dd0b1b6e5d31ce446d55a4b5e5083c98 +cksum=11824677 diff --git a/build/pkgs/traitlets/dependencies b/build/pkgs/traitlets/dependencies index 4935b093c01..9f3baafa568 100644 --- a/build/pkgs/traitlets/dependencies +++ b/build/pkgs/traitlets/dependencies @@ -1,4 +1,4 @@ -$(PYTHON) ipython_genutils decorator | pip +$(PYTHON) | pip ipython_genutils decorator six enum34 ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/traitlets/package-version.txt b/build/pkgs/traitlets/package-version.txt index 84f857936f7..f77856a6f1a 100644 --- a/build/pkgs/traitlets/package-version.txt +++ b/build/pkgs/traitlets/package-version.txt @@ -1 +1 @@ -4.2.2.p0 +4.3.1 diff --git a/build/pkgs/widgetsnbextension/checksums.ini b/build/pkgs/widgetsnbextension/checksums.ini index b73a6a5583d..0caa7094e8e 100644 --- a/build/pkgs/widgetsnbextension/checksums.ini +++ b/build/pkgs/widgetsnbextension/checksums.ini @@ -1,4 +1,4 @@ tarball=widgetsnbextension-VERSION.tar.gz -sha1=a61440a3841973e974f139ff566de9dc7dd1ebda -md5=0aa4e152c9ba2d704389dc2453f448c7 -cksum=3551709451 +sha1=9a616f9c4832bfda289bad1fef8766e03664be95 +md5=4a20d3c3fee43dba15da2e7c1ad6bbf3 +cksum=2004624864 diff --git a/build/pkgs/widgetsnbextension/package-version.txt b/build/pkgs/widgetsnbextension/package-version.txt index a8d18775f67..227cea21564 100644 --- a/build/pkgs/widgetsnbextension/package-version.txt +++ b/build/pkgs/widgetsnbextension/package-version.txt @@ -1 +1 @@ -1.2.6.p0 +2.0.0 diff --git a/build/pkgs/xz/type b/build/pkgs/xz/type index 134d9bc32d5..a6a7b9cd726 100644 --- a/build/pkgs/xz/type +++ b/build/pkgs/xz/type @@ -1 +1 @@ -optional +standard diff --git a/build/pkgs/zn_poly/SPKG.txt b/build/pkgs/zn_poly/SPKG.txt index a4679c5f7d3..2a660f1cef5 100644 --- a/build/pkgs/zn_poly/SPKG.txt +++ b/build/pkgs/zn_poly/SPKG.txt @@ -147,7 +147,7 @@ the file src/COPYING for details. * Ticket #8280: cygwin: zn_poly shared library named incorrectly on cygwin === zn_poly-0.9.p1 (David Kirkby, June 29th, 2009) === - * Ticket #6443 A GNUism in zn_poly-0.9.p0 causes linking problems wiith Sun's linker + * Ticket #6443 A GNUism in zn_poly-0.9.p0 causes linking problems with Sun's linker This was an easy fix - just substitue -soname for -h in src/makemakefile.py I did this with a sed script in spkg-install diff --git a/src/Makefile.in b/src/Makefile.in index ca6fbe8c8a0..e0889902db0 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -40,7 +40,7 @@ sage: SAGE_BUILD_DIR=/doesnotexist \ SAGE_PKGS=$(abs_top_srcdir)/build/pkgs \ SAGE_CYTHONIZED=$(abs_builddir)/build/cythonized \ - && python -u setup.py build install) + && python -u setup.py --no-user-cfg build install) clean: @echo "Deleting Sage library build artifacts..." diff --git a/src/bin/sage b/src/bin/sage index cb3b6110cad..3c79dd9cb31 100755 --- a/src/bin/sage +++ b/src/bin/sage @@ -210,6 +210,8 @@ usage_advanced() { #### 1.......................26..................................................78 #### |.....................--.|...................................................| echo "File conversion:" + echo " -rst2ipynb [...] -- Generates Jupyter notebook (.ipynb) from standalone" + echo " reStructuredText source." echo " -rst2txt [...] -- Generates Sage worksheet text file from standalone" echo " reStructuredText source." echo " -rst2sws [...] -- Generates Sage worksheet (.sws) from standalone" @@ -274,8 +276,26 @@ fi # an unclobbered environment before testing unsafe tickets. if [ "$1" = '-patchbot' -o "$1" = "--patchbot" ]; then shift - cd "$SAGE_ROOT" - exec local/bin/patchbot/patchbot.py "$@" + # We ask the Python from Sage where the patchbot is installed. + # We set PYTHONPATH to that directory such that the system Python + # should also find the sage_patchbot package. + cmd='import sage_patchbot as p; import os; print(os.path.dirname(p.__path__[0]))' + export PYTHONPATH=`"$SAGE_ROOT/sage" --python -c "$cmd"` + if [ -z "$PYTHONPATH" ]; then + # Something went wrong, assume that the patchbot is not installed + echo >&2 "Error: cannot find installation path for sage_patchbot" + echo >&2 "See https://wiki.sagemath.org/buildbot for instructions" + exit 1 + fi + + # Try "python2.7", then "python2", then "python" + shopt -s execfail # Do not exit if "exec" fails + exec python2.7 -m sage_patchbot.patchbot "$@" + exec python2 -m sage_patchbot.patchbot "$@" + exec python -m sage_patchbot.patchbot "$@" + echo >&2 "Error: cannot find a suitable Python program." + echo >&2 "The SageMath patchbot requires a system Python installation." + exit 127 fi # Check for '--upgrade' before sourcing sage-env: the top-level "make" @@ -539,7 +559,7 @@ fi if [ "$1" = '-pip' -o "$1" = '--pip' ]; then shift - exec pip-lock "$@" + exec pip "$@" fi if [ "$1" = '-fix-pkg-checksums' -o "$1" = '--fix-pkg-checksums' ]; then @@ -708,6 +728,11 @@ fi # File conversion ##################################################################### +if [ "$1" = '-rst2ipynb' -o "$1" = '--rst2ipynb' ]; then + shift + exec sage-rst2ipynb "$@" +fi + if [ "$1" = '-rst2txt' -o "$1" = '--rst2txt' ]; then shift exec sage-rst2txt "$@" diff --git a/src/bin/sage-banner b/src/bin/sage-banner index a25d3da6302..713519bfc9e 100644 --- a/src/bin/sage-banner +++ b/src/bin/sage-banner @@ -1,8 +1,5 @@ ┌────────────────────────────────────────────────────────────────────┐ -│ SageMath version 7.5.rc0, Release Date: 2016-12-18 │ +│ SageMath version 7.6, Release Date: 2017-03-25 │ │ Type "notebook()" for the browser-based notebook interface. │ │ Type "help()" for help. │ └────────────────────────────────────────────────────────────────────┘ -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃ Warning: this is a prerelease version, and it may be unstable. ┃ -┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ diff --git a/src/bin/sage-env b/src/bin/sage-env index 54c07837e01..0231cfac740 100644 --- a/src/bin/sage-env +++ b/src/bin/sage-env @@ -472,6 +472,11 @@ export MAXIMA_PREFIX="$SAGE_LOCAL" PERL5LIB="$SAGE_LOCAL/lib/perl5:$PERL5LIB" && export PERL5LIB +# Allow SAGE_BROWSER to override BROWSER (Trac #22449) +if [ -n "$SAGE_BROWSER" ]; then + export BROWSER="$SAGE_BROWSER" +fi + ############ architecture flags # Support flags to change the build architecture. Currently, this is diff --git a/src/bin/sage-rst2ipynb b/src/bin/sage-rst2ipynb new file mode 100755 index 00000000000..327ca9d4c8a --- /dev/null +++ b/src/bin/sage-rst2ipynb @@ -0,0 +1,46 @@ +#!/usr/bin/env bash + +fail () { + echo "ERROR: ${1}" 1>&2 + exit 1 +} + +help () { + cat << EOF +Usage: + + sage -rst2ipynb [] + +Generates IPython worksheet (.ipynb) from standalone reStructuredText source. + +If the destination is not specified, the IPython worksheet is written in the +standard output. + +Examples: + + sage -rst2ipynb file.rst file.ipynb + + sage -rst2ipynb file.rst + +Options: + -h, --help show this help message and exit +EOF +} + +if [ "${1}" = '-h' ] || [ "${1}" = '--help' ] ; then help ; exit 0 ; fi + +# tests if dependencies are available +pandoc -v > /dev/null 2>&1 || fail 'rst2ipnb requires pandoc; please install it on your system.' +[ $(sage-list-packages installed | grep '^rst2ipynb\.\.\.') ] || fail \ + 'The rst2ipynb optional package is required; please install it with `sage -i rst2ipynb`.' + +case "${#}" in + (1) + rst2ipynb --kernel='sagemath' ${1} 2> /dev/null || help ;; + (2) + rst2ipynb --kernel='sagemath' ${1} -o ${2} 2> /dev/null || help ;; + (*) + help ;; +esac + +exit 0 diff --git a/src/bin/sage-runtests b/src/bin/sage-runtests index 5a0fda63d65..1a9840387d2 100755 --- a/src/bin/sage-runtests +++ b/src/bin/sage-runtests @@ -38,7 +38,7 @@ if __name__ == "__main__": parser.add_option("--file-iterations", "--file_iterations", type=int, default=0, help="repeat each file this many times, stopping on the first failure") parser.add_option("-i", "--initial", action="store_true", default=False, help="only show the first failure in each file") - parser.add_option("--force_lib", "--force-lib", action="store_true", default=False, help="assume all files are Sage library files, regardless of location, ie don't import anything from the file tested") + parser.add_option("--force_lib", "--force-lib", action="store_true", default=False, help="do not import anything from the tested file(s)") parser.add_option("--abspath", action="store_true", default=False, help="print absolute paths rather than relative paths") parser.add_option("--verbose", action="store_true", default=False, help="print debugging output during the test") parser.add_option("-d", "--debug", action="store_true", default=False, help="drop into a python debugger when an unexpected error is raised") diff --git a/src/bin/sage-version.sh b/src/bin/sage-version.sh index 57b0971edc7..b168f200bc6 100644 --- a/src/bin/sage-version.sh +++ b/src/bin/sage-version.sh @@ -1,4 +1,4 @@ # Sage version information for shell scripts # This file is auto-generated by the sage-update-version script, do not edit! -SAGE_VERSION='7.5.rc0' -SAGE_RELEASE_DATE='2016-12-18' +SAGE_VERSION='7.6' +SAGE_RELEASE_DATE='2017-03-25' diff --git a/src/doc/ca/intro/index.rst b/src/doc/ca/intro/index.rst index 9049d653ae5..7fd49c8ce59 100644 --- a/src/doc/ca/intro/index.rst +++ b/src/doc/ca/intro/index.rst @@ -495,7 +495,7 @@ repetim els primers exemples:: sage: len(solutions) 2 sage: type(solutions[0]) - + <... 'dict'> sage: for sol in solutions: print((sol[x].n(digits=3), sol[y].n(digits=3))) (5.00 - 5.59*I, 5.00 + 5.59*I) (5.00 + 5.59*I, 5.00 - 5.59*I) diff --git a/src/doc/common/conf.py b/src/doc/common/conf.py index 521b1b87f4c..564407bd5f9 100644 --- a/src/doc/common/conf.py +++ b/src/doc/common/conf.py @@ -1,6 +1,7 @@ import sys, os, sphinx -from sage.env import SAGE_DOC_SRC, SAGE_DOC, SAGE_SRC +from sage.env import SAGE_DOC_SRC, SAGE_DOC, SAGE_SRC, THEBE_DIR from datetime import date +from six import iteritems # If your extensions are in another directory, add it here. sys.path.append(os.path.join(SAGE_SRC, "sage_setup", "docbuild", "ext")) @@ -201,7 +202,8 @@ def set_intersphinx_mappings(app): # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = [os.path.join(SAGE_DOC_SRC, 'common', 'static'), 'static'] +html_static_path = [os.path.join(SAGE_DOC_SRC, 'common', 'static'), THEBE_DIR, + 'static'] # We use MathJax to build the documentation unless the environment # variable SAGE_DOC_MATHJAX is set to "no" or "False". (Note that if @@ -307,7 +309,7 @@ def set_intersphinx_mappings(app): \usepackage{textcomp} \usepackage{mathrsfs} -% Only declare unicode characters when compiling with pdftex; E.g. japanese +% Only declare unicode characters when compiling with pdftex; E.g. japanese % tutorial does not use pdftex \ifPDFTeX \DeclareUnicodeCharacter{01CE}{\capitalcaron a} @@ -354,7 +356,7 @@ def set_intersphinx_mappings(app): \DeclareUnicodeCharacter{03C5}{\ensuremath{\upsilon}} \DeclareUnicodeCharacter{03A5}{\ensuremath{\Upsilon}} \DeclareUnicodeCharacter{2113}{\ell} - + \DeclareUnicodeCharacter{221A}{\ensuremath{\sqrt{}}} \DeclareUnicodeCharacter{2264}{\leq} \DeclareUnicodeCharacter{2265}{\geq} @@ -378,7 +380,7 @@ def set_intersphinx_mappings(app): \DeclareUnicodeCharacter{2308}{\lceil} \DeclareUnicodeCharacter{2309}{\rceil} \DeclareUnicodeCharacter{22C5}{\ensuremath{\cdot}} - + \newcommand{\sageMexSymbol}[1] {{\fontencoding{OMX}\fontfamily{cmex}\selectfont\raisebox{0.75em}{\symbol{#1}}}} \DeclareUnicodeCharacter{239B}{\sageMexSymbol{"30}} % parenlefttp @@ -393,7 +395,7 @@ def set_intersphinx_mappings(app): \DeclareUnicodeCharacter{23A4}{\sageMexSymbol{"33}} % bracketrighttp \DeclareUnicodeCharacter{23A5}{\sageMexSymbol{"37}} % bracketrightex \DeclareUnicodeCharacter{23A6}{\sageMexSymbol{"35}} % bracketrightbt - + \DeclareUnicodeCharacter{23A7}{\sageMexSymbol{"38}} % curly brace left top \DeclareUnicodeCharacter{23A8}{\sageMexSymbol{"3C}} % curly brace left middle \DeclareUnicodeCharacter{23A9}{\sageMexSymbol{"3A}} % curly brace left bottom @@ -403,11 +405,11 @@ def set_intersphinx_mappings(app): \DeclareUnicodeCharacter{23AD}{\sageMexSymbol{"3B}} % curly brace right bottom \DeclareUnicodeCharacter{23B0}{\{} % 2-line curly brace left top half (not in cmex) \DeclareUnicodeCharacter{23B1}{\}} % 2-line curly brace right top half (not in cmex) - + \DeclareUnicodeCharacter{2320}{\ensuremath{\int}} % top half integral \DeclareUnicodeCharacter{2321}{\ensuremath{\int}} % bottom half integral \DeclareUnicodeCharacter{23AE}{\ensuremath{\|}} % integral extenison - + \DeclareUnicodeCharacter{2571}{/} % Box drawings light diagonal upper right to lower left \fi @@ -509,7 +511,7 @@ def check_nested_class_picklability(app, what, name, obj, skip, options): # Check picklability of nested classes. Adapted from # sage.misc.nested_class.modify_for_nested_pickle. module = sys.modules[obj.__module__] - for (nm, v) in obj.__dict__.iteritems(): + for (nm, v) in iteritems(obj.__dict__): if (isinstance(v, type) and v.__name__ == nm and v.__module__ == module.__name__ and diff --git a/src/doc/common/themes/sage/static/thebe.js b/src/doc/common/themes/sage/static/thebe.js deleted file mode 120000 index 4bad1ac3830..00000000000 --- a/src/doc/common/themes/sage/static/thebe.js +++ /dev/null @@ -1 +0,0 @@ -../../../../../../local/share/thebe/thebe.js \ No newline at end of file diff --git a/src/doc/common/themes/sageref/static/thebe.js b/src/doc/common/themes/sageref/static/thebe.js deleted file mode 120000 index ca681557c5c..00000000000 --- a/src/doc/common/themes/sageref/static/thebe.js +++ /dev/null @@ -1 +0,0 @@ -../../sage/static/thebe.js \ No newline at end of file diff --git a/src/doc/de/thematische_anleitungen/sage_gymnasium.rst b/src/doc/de/thematische_anleitungen/sage_gymnasium.rst index 745068b357e..5a150a0f8c6 100644 --- a/src/doc/de/thematische_anleitungen/sage_gymnasium.rst +++ b/src/doc/de/thematische_anleitungen/sage_gymnasium.rst @@ -1242,7 +1242,7 @@ Seite der deutschen Version von Sage findet sich hier: .. rubric:: Footnotes .. [#keywords] http://docs.python.org/2/reference/lexical_analysis.html#keywords -.. [#tutorial] http://www.sagemath.org/de/html/tutorial/ +.. [#tutorial] http://doc.sagemath.org/html/de/tutorial/ .. [#units] http://doc.sagemath.org/html/en/reference/calculus/sage/symbolic/units.html .. [#2dgraphics] http://doc.sagemath.org/html/en/reference/plotting/index.html .. [#scatterplot] http://doc.sagemath.org/html/en/reference/plotting/sage/plot/scatter_plot.html diff --git a/src/doc/de/tutorial/interfaces.rst b/src/doc/de/tutorial/interfaces.rst index e03952cb008..edc59c58dff 100644 --- a/src/doc/de/tutorial/interfaces.rst +++ b/src/doc/de/tutorial/interfaces.rst @@ -61,7 +61,7 @@ mehr referenziert wird. Die Objekte haben außerdem verschiedene Typen: sage: type(gp('znprimroot(10007)')) sage: type(pari('znprimroot(10007)')) - + Welche Variante sollten Sie also nutzen? Das kommt darauf an was Sie tun. Die GP-Schnittstelle kann alles was ein normales @@ -98,9 +98,9 @@ Zuerst erstellen wir eine PARI-Liste aus einer Python-Liste. sage: v [1, 2, 3, 4, 5] sage: type(v) - + -Jedes PARI-Objekt ist vom Typ ``py_pari.gen``. Den PARI Typ des vorliegenden +Jedes PARI-Objekt ist vom Typ ``Gen``. Den PARI Typ des vorliegenden Objekts können Sie mit der ``type`` Unterfunktion herausfinden. .. link @@ -113,7 +113,7 @@ Objekts können Sie mit der ``type`` Unterfunktion herausfinden. Um eine elliptische Kurve in PARI zu erstellen geben Sie ``ellinit([1,2,3,4,5])`` ein. Bei Sage ist es ähnlich, nur dass ``ellinit`` eine Methode ist, die von jedem PARI-Objekt -aus aufgerufen werden kann, z.B. unser ``t\_VEC v``. +aus aufgerufen werden kann, z.B. unser ``t_VEC`` `v`. .. link diff --git a/src/doc/de/tutorial/introduction.rst b/src/doc/de/tutorial/introduction.rst index 0743f5646dc..b524882ee8c 100644 --- a/src/doc/de/tutorial/introduction.rst +++ b/src/doc/de/tutorial/introduction.rst @@ -101,7 +101,7 @@ Hier geben wir nur ein paar Kommentare ab. einzige Datei in ein Verzeichnis kopieren, welches TeX durchsucht. Die Dokumentation für SageTeX befindet sich in - ``$SAGE_ROOT/local/share/texmf/tex/generic/sagetex/``, wobei + ``$SAGE_ROOT/local/share/texmf/tex/latex/sagetex/``, wobei "``$SAGE_ROOT``" auf das Verzeichnis zeigt, in welches Sie Sage installiert haben, zum Beispiel ``/opt/sage-4.2.1``. diff --git a/src/doc/de/tutorial/programming.rst b/src/doc/de/tutorial/programming.rst index e5b6c504504..00e9d3d0343 100644 --- a/src/doc/de/tutorial/programming.rst +++ b/src/doc/de/tutorial/programming.rst @@ -209,17 +209,17 @@ Gleitkommazahlen, wie hier zu sehen ist: :: sage: s = "sage"; type(s) - + <... 'str'> sage: s = 'sage'; type(s) # Sie können einfache oder doppelte Anführungszeichen verwenden - + <... 'str'> sage: s = [1,2,3,4]; type(s) - + <... 'list'> sage: s = (1,2,3,4); type(s) - + <... 'tuple'> sage: s = int(2006); type(s) - + <... 'int'> sage: s = float(2006); type(s) - + <... 'float'> Hierzu fügt Sage noch viele weitere hinzu. Zum Beispiel Vektorräume: @@ -303,7 +303,7 @@ Computer-Algebra-Systemen), die Elemente der Liste werden bei sage: v = [2, 3, 5, 'x', SymmetricGroup(3)]; v [2, 3, 5, 'x', Symmetric group of order 3! as a permutation group] sage: type(v) - + <... 'list'> sage: v[0] 2 sage: v[2] @@ -377,7 +377,7 @@ können. sage: v = (1,2,3,4); v (1, 2, 3, 4) sage: type(v) - + <... 'tuple'> sage: v[1] = 5 Traceback (most recent call last): ... @@ -420,7 +420,7 @@ Listen benutzt werden können. sage: list(v) [1, 2, 3, 4/5] sage: type(list(v)) - + <... 'list'> Ein weiteres Beispiel von unveränderbaren Folgen sind Basen von Vektorräumen. Es ist wichtig, dass sie nicht verändert werden können. @@ -456,7 +456,7 @@ beliebigen Objekten. sage: d = {1:5, 'sage':17, ZZ:GF(7)} sage: type(d) - + <... 'dict'> sage: d.keys() [1, 'sage', Integer Ring] sage: d['sage'] @@ -476,7 +476,7 @@ Daten umwandeln: :: - sage: d.items() + sage: list(d.items()) [(1, 5), ('sage', 17), (Integer Ring, Finite Field of size 7)] Eine häufig vorkommende Ausdrucksweise ist über einem Paar in einem @@ -485,7 +485,7 @@ Dictionary zu iterieren: :: sage: d = {2:4, 4:16, 3:9} - sage: [a*b for a, b in d.iteritems()] + sage: [a*b for a, b in d.items()] [8, 27, 64] Ein Dictionary ist ungeordnet, wie die letzte Ausgabe verdeutlicht. @@ -676,18 +676,6 @@ gleichen Typ konvertieren, falls dies möglich ist: True True -Fast immer können zwei beliebige Objekte verglichen werden. Es gibt -keine Voraussetzung die besagt, dass die Objekte mit einer totalen Ordnung -versehen sein müssen. - - -:: - - sage: 2 < CC(3.1,1) - True - sage: 5 < VectorSpace(QQ,3) # output can be somewhat random - True - Nutzen Sie bool für symbolische Ungleichungen: :: diff --git a/src/doc/de/tutorial/sagetex.rst b/src/doc/de/tutorial/sagetex.rst index a2654ab87f4..8f58e812a78 100644 --- a/src/doc/de/tutorial/sagetex.rst +++ b/src/doc/de/tutorial/sagetex.rst @@ -11,11 +11,11 @@ TeX-System "installieren", wobei "installieren" hier eine einzige Datei kopieren bedeutet. Siehe hierfür auch :ref:`installation` in diesem Tutorial und den Abschnitt "Make SageTeX known to TeX" des `Sage installation guide `_ (`dieser Link -<../installation/index.html>`_ sollte Sie zu einer lokalen Kopie der +<../../en/installation/index.html>`_ sollte Sie zu einer lokalen Kopie der Installationsanleitung führen) um weitere Informationen zu erhalten. Hier stellen wir ein sehr kurzes Beispiel vor wie man SageTeX nutzt. -Die komplette Dokumentation finden Sie unter ``SAGE_ROOT/local/share/texmf/tex/generic/sagetex``, +Die komplette Dokumentation finden Sie unter ``SAGE_ROOT/local/share/texmf/tex/latex/sagetex``, wobei ``SAGE_ROOT`` das Installationsverzeichnis von Sage ist. Dieses Verzeichnis enthält die Dokumentation, eine Beispieldatei und einige nützliche Python Skripte. @@ -103,4 +103,4 @@ an den Sage Befehlen in Ihrem Dokument vorgenommen haben. Es gibt noch viel mehr über SageTeX zu sagen, aber da sowohl Sage alsauch LaTeX komplexe und mächtige Werkzeuge sind, sollten Sie die Dokumentation -über SageTeX in ``SAGE_ROOT/local/share/texmf/tex/generic/sagetex`` lesen. +über SageTeX in ``SAGE_ROOT/local/share/texmf/tex/latex/sagetex`` lesen. diff --git a/src/doc/de/tutorial/tour_algebra.rst b/src/doc/de/tutorial/tour_algebra.rst index bd788d9d7e7..b04ae3ca54b 100644 --- a/src/doc/de/tutorial/tour_algebra.rst +++ b/src/doc/de/tutorial/tour_algebra.rst @@ -54,8 +54,7 @@ lösen wir das System symbolisch: sage: eq2 = q*y+p*x==-6 sage: eq3 = q*y^2+p*x^2==24 sage: solve([eq1,eq2,eq3,p==1],p,q,x,y) - [[p == 1, q == 8, x == -4/3*sqrt(10) - 2/3, y == 1/6*sqrt(5)*sqrt(2) - 2/3], - [p == 1, q == 8, x == 4/3*sqrt(10) - 2/3, y == -1/6*sqrt(5)*sqrt(2) - 2/3]] + [[p == 1, q == 8, x == -4/3*sqrt(10) - 2/3, y == 1/6*sqrt(10) - 2/3], [p == 1, q == 8, x == 4/3*sqrt(10) - 2/3, y == -1/6*sqrt(10) - 2/3]] Um eine numerische Approximation der Lösungen zu erhalten können Sie stattdessen wie folgt vorgehen: @@ -212,7 +211,7 @@ Lösung: Berechnen Sie die Laplace-Transformierte der ersten Gleichung sage: de1 = maxima("2*diff(x(t),t, 2) + 6*x(t) - 2*y(t)") sage: lde1 = de1.laplace("t","s"); lde1 - 2*(-%at('diff(x(t),t,1),t=0)+s^2*'laplace(x(t),t,s)-x(0)*s)-2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s) + 2*((-%at('diff(x(t),t,1),t=0))+s^2*'laplace(x(t),t,s)-x(0)*s)-2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s) Das ist schwierig zu lesen, es besagt jedoch, dass @@ -228,7 +227,7 @@ Laplace-Transformierte der zweiten Gleichung: sage: de2 = maxima("diff(y(t),t, 2) + 2*y(t) - 2*x(t)") sage: lde2 = de2.laplace("t","s"); lde2 - -%at('diff(y(t),t,1),t=0)+s^2*'laplace(y(t),t,s)+2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s)-y(0)*s + (-%at('diff(y(t),t,1),t=0))+s^2*'laplace(y(t),t,s)+2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s)-y(0)*s Dies besagt diff --git a/src/doc/de/tutorial/tour_assignment.rst b/src/doc/de/tutorial/tour_assignment.rst index b0ceac95e27..e406ab4621c 100644 --- a/src/doc/de/tutorial/tour_assignment.rst +++ b/src/doc/de/tutorial/tour_assignment.rst @@ -97,7 +97,7 @@ beliebigen Python-Typs innerhalb eines Sichtbarkeitsbereich aufnehmen. sage: a = 'hello' # jetzt ist a ein String sage: type(a) - + <... 'str'> Die Programmiersprache C, welche statisch typisiert ist, unterscheidet sich hierzu stark; eine Variable, die dazu deklariert ist eine Ganzzahl (int) diff --git a/src/doc/de/tutorial/tour_functions.rst b/src/doc/de/tutorial/tour_functions.rst index 6f994c2f106..501a2f9dbd9 100644 --- a/src/doc/de/tutorial/tour_functions.rst +++ b/src/doc/de/tutorial/tour_functions.rst @@ -18,7 +18,7 @@ oder integriert werden. sage: def f(z): return z^2 sage: type(f) - + <... 'function'> sage: f(3) 9 sage: plot(f, 0, 2) diff --git a/src/doc/de/tutorial/tour_help.rst b/src/doc/de/tutorial/tour_help.rst index 112d8e03f10..b5149c198a9 100644 --- a/src/doc/de/tutorial/tour_help.rst +++ b/src/doc/de/tutorial/tour_help.rst @@ -62,7 +62,7 @@ Beispiel) gefolgt von einem Fragezeichen eingegeben wird: 0.69314718055994530941723212145817656807 # 64-bit sage: sudoku? File: sage/local/lib/python2.5/site-packages/sage/games/sudoku.py - Type: + Type: <... 'function'> Definition: sudoku(A) Docstring: diff --git a/src/doc/en/constructions/groups.rst b/src/doc/en/constructions/groups.rst index 4d9a10f8846..e76917139b7 100644 --- a/src/doc/en/constructions/groups.rst +++ b/src/doc/en/constructions/groups.rst @@ -502,7 +502,7 @@ to be returned. For example, to construct sage: A = groups.presentation.FGAbelian([4,2,2,2]) The output for a given group is the same regardless of the input list of -integers. The following example yeilds identical presentations for the +integers. The following example yields identical presentations for the cyclic group of order 30. :: @@ -538,9 +538,9 @@ order 16 as a semidirect product of cyclic groups. The following table shows the groups of order 15 or less, and how to construct them in Sage. Repeated commands have been omitted but instead are described -by the following exmples. +by the following examples. -The cyclic group of order `n` can be crated with a single command: +The cyclic group of order `n` can be created with a single command: .. skip diff --git a/src/doc/en/constructions/linear_algebra.rst b/src/doc/en/constructions/linear_algebra.rst index 58747c663f1..7960119909d 100644 --- a/src/doc/en/constructions/linear_algebra.rst +++ b/src/doc/en/constructions/linear_algebra.rst @@ -417,12 +417,7 @@ Using maxima, you can easily solve linear equations: (a, b, c) sage: eqn = [a+b*c==1, b-a*c==0, a+b==5] sage: s = solve(eqn, a,b,c); s - [[a == (25*I*sqrt(79) + 25)/(6*I*sqrt(79) - 34), - b == (5*I*sqrt(79) + 5)/(I*sqrt(79) + 11), - c == 1/10*I*sqrt(79) + 1/10], - [a == (25*I*sqrt(79) - 25)/(6*I*sqrt(79) + 34), - b == (5*I*sqrt(79) - 5)/(I*sqrt(79) - 11), - c == -1/10*I*sqrt(79) + 1/10]] + [[a == -1/4*I*sqrt(79) + 11/4, b == 1/4*I*sqrt(79) + 9/4, c == 1/10*I*sqrt(79) + 1/10], [a == 1/4*I*sqrt(79) + 11/4, b == -1/4*I*sqrt(79) + 9/4, c == -1/10*I*sqrt(79) + 1/10]] You can even nicely typeset the solution in LaTeX: diff --git a/src/doc/en/constructions/linear_codes.rst b/src/doc/en/constructions/linear_codes.rst index e2feae3cb87..b11e17e66ac 100644 --- a/src/doc/en/constructions/linear_codes.rst +++ b/src/doc/en/constructions/linear_codes.rst @@ -46,9 +46,9 @@ the four Golay codes :: - sage: C = codes.ExtendedTernaryGolayCode() + sage: C = codes.GolayCode(GF(3)) sage: C - [12, 6] linear code over GF(3) + [12, 6, 6] Extended Golay code over Finite Field of size 3 sage: C.minimum_distance() 6 sage: C.generator_matrix() diff --git a/src/doc/en/developer/advanced_git.rst b/src/doc/en/developer/advanced_git.rst index 0717776466e..a1deb4935b1 100644 --- a/src/doc/en/developer/advanced_git.rst +++ b/src/doc/en/developer/advanced_git.rst @@ -66,6 +66,112 @@ branch -D my_branch`` at the end to delete the local branch that you created only to review the ticket. +.. _section-git-update-latest: + +Update Branch to Latest SageMath Version (and Minimizing Recompilation Time) +============================================================================ + +- You have a compiled and working new SageMath version ``n``, and +- you want to work on a branch ``some_code`` which is based on some old SageMath version ``o`` +- by updating this branch from version ``o`` to ``n`` +- with only recompiling changed files (and not all touched files from ``o`` to ``n``), +- then continue reading this section. + + +Introduction +------------ + +When developing, quite frequently one ends up with a branch which is +not based on the latest (beta) version of SageMath. + +.. NOTE:: + + Continue working on a feature based on an old branch is perfecly + fine and usually there is no need to merge in this latest SageMath + version. + +However sometimes there is a need for a merge, for example + +- if there are conflicts with the latest version or +- one needs a recent feature or +- simply because the old SageMath version is not available on your machine + any longer. + +Then merging in the latest SageMath version has to be done. + + +Merge in the Latest SageMath Version +------------------------------------ + +(This is the easy way without minimizing the recompilation time.) + +Suppose we are on our current working branch ``some_code`` +(branch is checked out). Then +:: + + git merge develop + +does the merging, i.e. we merge the latest development version into +our working branch. + +However, after this merge, we need to (partially) recompile +SageMath. Sometimes this can take ages (as many files are touched and +their timestamps are renewed) and there is a way to avoid it. + + +Minimize the Recompilation Time +------------------------------- + +Suppose we are on some new SageMath (e.g. on branch ``develop``) which +was already compiled and runs successfully, and we have an "old" +branch ``some_code``, that we want to bring onto this SageMath version +(without triggering unnecessary recompilations). + +We first create a new working tree in a directory ``new_worktree`` and switch +to this directory:: + + git worktree add new_worktree + cd new_worktree + +Here we have a new copy of our source files. Thus no timestamps +etc. of the original repository will be changed. Now we do the merge:: + + git checkout some_code + git merge develop + +And go back to our original repository:: + + git checkout develop + cd .. + +We can now safely checkout ``some_code``:: + + git checkout some_code + +We still need to call +:: + + make + +but only changed files will be recompiled. + +To remove the new working tree simply use +:: + + rm -r new_worktree + + +Why not Merging the Other Way Round? +------------------------------------ + +Being on some new SageMath (e.g. on branch ``develop``) which runs +successfully, it would be possible to merge in our branch +``some_code`` into develop. This would produce the same source files +and avoid unnecessary recompilations. However, it makes reading git's +history very unpleasant: For example, it is hard to keep track of changes etc., +as one cannot simply pursue the first parent of each git commit. + + .. _section-git-recovery: Reset and Recovery @@ -97,7 +203,7 @@ which is some 40-digit hexadecimal number (the SHA1 hash). Then use ... [user@localhost sage]$ git reset --hard eafae -.. warning:: +.. WARNING:: Any *uncommitted* changes will be lost! diff --git a/src/doc/en/developer/coding_basics.rst b/src/doc/en/developer/coding_basics.rst index ac10d27dd00..3754d167b5b 100644 --- a/src/doc/en/developer/coding_basics.rst +++ b/src/doc/en/developer/coding_basics.rst @@ -402,8 +402,8 @@ information. You can use the existing functions of Sage as templates. Note the trailing underscores which makes the citations into hyperlinks. See below for more about the master bibliography file. For more about citations, - see the `Sphinx/ReST markup for citations - `_. For links to trac tickets or + see the `Sphinx/reST markup for citations + `_. For links to trac tickets or wikipedia, see :ref:`chapter-sage_manuals_links`. - A **TESTS** block (highly recommended). @@ -421,20 +421,30 @@ information. You can use the existing functions of Sage as templates. For the purposes of removal, A "TESTS" block is a block starting with "TEST:" or "TESTS:" (or the same with two colons), on a line on - its own, and ending with an unindented line (that is, the same level - of indentation as "TESTS") matching one of the following: + its own, and ending either with a line indented less than "TESTS", + or with a line with the same level of indentation -- not more -- + matching one of the following: - - a line which starts with whitespace and then a Sphinx directive - of the form ".. foo:", optionally followed by other text. + - a Sphinx directive of the form ".. foo:", optionally followed by + other text. - - a line which starts with whitespace and then text of the form - "UPPERCASE:", optionally followed by other text. + - text of the form "UPPERCASE:", optionally followed by other + text. - - lines which look like a ReST header: one line containing + - lines which look like a reST header: one line containing anything, followed by a line consisting only of whitespace, - followed by a string of hyphens, equal signs, or other - characters which are valid markers for ReST headers: - ``- = ` : ' " ~ _ ^ * + # < >``. + followed by a string of hyphens, equal signs, or other + characters which are valid markers for reST + headers: ``- = ` : ' " ~ _ ^ * + # < >``. + +Sage documentation style +^^^^^^^^^^^^^^^^^^^^^^^^ + + All Sage documentation is written in reStructuredText (reST) and is + processed by Sphinx: see http://www.sphinx-doc.org/rest.html for an + introduction. Sage's style is for all reST and Sphinx directives + (like ``.. WARNING::``, ``.. NOTE::``, ``.. MATH::``, etc.) to be + written in uppercase. Lines should be shorter than 80 characters. Sage's master **BIBLIOGRAPHY** file ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -468,8 +478,8 @@ Sage's master **BIBLIOGRAPHY** file that the letter (``C.`` in the example above) will not be interpreted as a list enumerator. - For more about citations, see the `Sphinx/ReST markup for citations - `_. + For more about citations, see the `Sphinx/reST markup for citations + `_. Template ^^^^^^^^ @@ -802,8 +812,8 @@ written. .. _section-further_conventions: -Special Markup to Influence Tests ---------------------------------- +Special Markup to Influence Doctests +------------------------------------ Overly complicated output in the example code can be shortened by an ellipsis marker ``...``:: @@ -997,8 +1007,8 @@ further development on Sage. .. _chapter-testing: -Running Automated Tests -======================= +Running Automated Doctests +========================== This section describes Sage's automated testing of test files of the following types: ``.py``, ``.pyx``, ``.sage``, ``.rst``. Briefly, use @@ -1035,13 +1045,13 @@ write for the documentation and have them work. For more information, see :ref:`chapter-doctesting`. -Testing ReST Documentation +Testing reST Documentation -------------------------- Run ``sage -t `` to test the examples in verbatim -environments in ReST documentation. +environments in reST documentation. -Of course in ReST files, one often inserts explanatory texts between +Of course in reST files, one often inserts explanatory texts between different verbatim environments. To link together verbatim environments, use the ``.. link`` comment. For example:: @@ -1070,7 +1080,7 @@ have that example skipped when testing the file. This goes in the same place as the ``.. link`` in the previous example. See the files in ``SAGE_ROOT/src/doc/en/tutorial/`` for many -examples of how to include automated testing in ReST documentation for +examples of how to include automated testing in reST documentation for Sage. diff --git a/src/doc/en/developer/coding_in_python.rst b/src/doc/en/developer/coding_in_python.rst index 4eec8bd4cf4..bd37d0fb53c 100644 --- a/src/doc/en/developer/coding_in_python.rst +++ b/src/doc/en/developer/coding_in_python.rst @@ -213,7 +213,7 @@ replacements are made: sage: a 393939 sage: type(a) - + <... 'int'> sage: b = 393939 sage: type(b) diff --git a/src/doc/en/developer/doctesting.rst b/src/doc/en/developer/doctesting.rst index dbe87f4e9de..dd38c02f654 100644 --- a/src/doc/en/developer/doctesting.rst +++ b/src/doc/en/developer/doctesting.rst @@ -666,8 +666,8 @@ function in the global namespace, passing it either a string or a module:: Optional Arguments ================== -Run Long Tests --------------- +Run Long Doctests +----------------- Ideally, doctests should not take any noticeable amount of time. If you really need longer-running doctests (anything beyond about one @@ -779,8 +779,8 @@ Finally, you can disable any warnings about long tests with .. _section-optional-doctest-flag: -Run Optional Tests ------------------- +Run Optional Doctests +--------------------- You can run tests that require optional packages by using the ``--optional`` flag. Obviously, you need to have installed the @@ -863,8 +863,8 @@ To run all tests, regardless of whether they are marked optional, pass ``all`` a cpu time: 4.7 seconds cumulative wall time: 11.2 seconds -Running Tests in Parallel -------------------------- +Running Doctests in Parallel +---------------------------- If you're testing many files, you can get big speedups by using more than one thread. To run doctests in parallel use the ``--nthreads`` @@ -1212,11 +1212,11 @@ Note that even with this option, the tests within a given doctest block are stil Testing external files ^^^^^^^^^^^^^^^^^^^^^^ -When testing a file that's not part of the Sage library, the testing +When testing a file which is not part of a package (which is not in a +directory containing an ``__init__.py`` file), the testing code loads the globals from that file into the namespace before -running tests. To model the behavior used on the Sage library instead -(where imports must be explicitly specified), use the ``--force-lib`` -flag. +running tests. To disable this behaviour (and require imports to be +explicitly specified), use the ``--force-lib`` option. Auxilliary files ^^^^^^^^^^^^^^^^ diff --git a/src/doc/en/developer/git_setup.rst b/src/doc/en/developer/git_setup.rst index 82ddafdb2d8..8f9a2391209 100644 --- a/src/doc/en/developer/git_setup.rst +++ b/src/doc/en/developer/git_setup.rst @@ -35,8 +35,8 @@ Fedora ``sudo yum install git-core`` Windows - Download and install `msysGit - `_ + Download and install `Git for Windows + `_ OS X Use the `git OSX installer diff --git a/src/doc/en/developer/git_trac.rst b/src/doc/en/developer/git_trac.rst index cfda8f1aa01..a7307342ace 100644 --- a/src/doc/en/developer/git_trac.rst +++ b/src/doc/en/developer/git_trac.rst @@ -68,7 +68,7 @@ there whenever you need to update the ``git-trac`` command. Git and Trac Configuration ========================== -.. note:: +.. NOTE:: * `trac `_ uses username/password for authentication. @@ -107,7 +107,7 @@ any changes. You may have to add your private key to your authentication agent:: [user@localhost sage]$ ssh-add -.. note:: +.. NOTE:: The ``git trac config`` command will automatically add a ``trac`` remote git repository to your list of remotes if necessary. @@ -158,7 +158,7 @@ explicitly. See ``git trac create -h`` for details. This new branch is automatically checked out for you with the *local branch* name ``t/12345/last_twin_prime``. -.. note:: +.. NOTE:: Only some trac fields are filled in automatically. See :ref:`section-trac-fields` for what trac fields are available and @@ -342,7 +342,7 @@ for merging is easy:: This creates a new "merge" commit, joining your current branch and ``other_branch``. -.. warning:: +.. WARNING:: You should avoid merging branches both ways. Once A merged B and B merged A, there is no way to distinguish commits that were diff --git a/src/doc/en/developer/manual_git.rst b/src/doc/en/developer/manual_git.rst index 63b2f021e57..973675a997f 100644 --- a/src/doc/en/developer/manual_git.rst +++ b/src/doc/en/developer/manual_git.rst @@ -22,6 +22,16 @@ by running:: [user@localhost sage]$ git checkout develop [user@localhost sage]$ make +.. NOTE:: + + If your system supports multiprocessing and you want to use multiple + processors to build Sage, replace the last line above by:: + + [user@localhost sage]$ MAKE='make -jNUM' make + + to tell the ``make`` program to run ``NUM`` jobs in parallel when + building Sage. + .. _section-git-trac: The Trac Server @@ -46,7 +56,7 @@ of them as bookmarks. You can then use ``git pull`` to get changes and [user@localhost sage]$ git trac [ARGS] -.. note:: +.. NOTE:: In the command above we set up the remote to only track the ``master`` branch on the trac server (the ``-t master`` @@ -60,8 +70,10 @@ We set up the remote here to perform read-only operations (fetch) using the git protocol and write operations (push) using the ssh protocol (specified by the ``git@`` part). To use the ssh protocol you need to have a trac account and to set up your ssh public key as -described in :ref:`section-trac-ssh-key`. Authentication is necessary -if you want to upload anything to ensure that it really is from you. +described in `Trac authentication through ssh +`_. +Authentication is necessary if you want to upload anything to ensure +that it really is from you. If you want to use ssh only, use these commands:: @@ -158,7 +170,7 @@ Getting Changes A common task during development is to synchronize your local copy of the branch with the branch on trac. In particular, assume you -downloaded somebody else's branch made some suggestions for +downloaded somebody else's branch and made some suggestions for improvements on the trac ticket. Now the original author incorporated your suggestions into his branch, and you want to get the added changesets to complete your review. Assuming that you originally got @@ -325,7 +337,7 @@ If you don't have a favourite merge tool we suggest you try `meld `_ (cross-platform). The result looks like the following screenshot. -.. image:: static/meld-screenshot.png +.. IMAGE:: static/meld-screenshot.png The middle file is the most recent common parent; on the right is Bob's version and on the left is Alice's conflicting version. Clicking diff --git a/src/doc/en/developer/packaging_old_spkgs.rst b/src/doc/en/developer/packaging_old_spkgs.rst index 6cad5b2bb08..9c3e5838962 100644 --- a/src/doc/en/developer/packaging_old_spkgs.rst +++ b/src/doc/en/developer/packaging_old_spkgs.rst @@ -313,7 +313,7 @@ review, it might be included into the core Sage library, or it might become an optional download from the Sage website, so anybody can automatically install it by typing ``sage -p mypackage-version.spkg``. -.. note:: +.. NOTE:: For any spkg: @@ -325,7 +325,7 @@ automatically install it by typing ``sage -p mypackage-version.spkg``. .. _trac ticket #299: http://trac.sagemath.org/sage_trac/ticket/299 -.. note:: +.. NOTE:: External Magma code goes in ``SAGE_ROOT/src/ext/magma/user``, so if you want to redistribute Magma code with Sage as a package that diff --git a/src/doc/en/developer/reviewer_checklist.rst b/src/doc/en/developer/reviewer_checklist.rst index 33dc1442ee6..0a446fc85eb 100644 --- a/src/doc/en/developer/reviewer_checklist.rst +++ b/src/doc/en/developer/reviewer_checklist.rst @@ -103,7 +103,7 @@ example by the author of the original patch. For more advice on reviewing, see [WSblog]_. -.. note:: +.. NOTE:: "The perfect is the enemy of the good" diff --git a/src/doc/en/developer/sage_manuals.rst b/src/doc/en/developer/sage_manuals.rst index 34827f65824..82f2b1b7d96 100644 --- a/src/doc/en/developer/sage_manuals.rst +++ b/src/doc/en/developer/sage_manuals.rst @@ -8,7 +8,7 @@ Sage's manuals are written in `ReST `_ (reStructuredText), and generated with the software `Sphinx `_: -.. list-table:: +.. LIST-TABLE:: :widths: 4 12 :header-rows: 1 @@ -102,7 +102,7 @@ by Sage, you can link toward it without specifying its full path:: **Sage-specific roles:** Sage defines several specific *roles*: -.. list-table:: +.. LIST-TABLE:: :widths: 4 4 4 :header-rows: 0 @@ -219,10 +219,10 @@ Syntax Highlighting Cython Code =============================== If you want to write :ref:`Cython ` code in a ReST file, precede -the code block by ``.. code-block:: cython`` instead of the usual ``::``. Enable -syntax-highlighting in a whole file with ``.. highlight:: cython``. Example: +the code block by ``.. CODE-BLOCK:: cython`` instead of the usual ``::``. Enable +syntax-highlighting in a whole file with ``.. HIGHLIGHT:: cython``. Example: -.. code-block:: cython +.. CODE-BLOCK:: cython cdef extern from "descrobject.h": ctypedef struct PyMethodDef: diff --git a/src/doc/en/developer/trac.rst b/src/doc/en/developer/trac.rst index 6d223012611..8852835cc57 100644 --- a/src/doc/en/developer/trac.rst +++ b/src/doc/en/developer/trac.rst @@ -51,7 +51,7 @@ There are two avenues to prove to the trac server that you are who you claim to be. First, to change the ticket web pages you need to log in to trac using a username/password. Second, there is public key cryptography used by git when copying new source files to the -repository. This section will show you how to setup both. +repository. This section will show you how to set up both. Generating and Uploading your SSH Keys -------------------------------------- @@ -351,7 +351,7 @@ trac ticket, enter the ticket number for the stopgap ticket in the "Stopgaps" field (see :ref:`section-trac-fields`). Stopgap tickets should be marked as blockers. -.. note:: +.. NOTE:: If mathematically valid code causes Sage to raise an error or crash, for example, there is no need for a stopgap. Rather, diff --git a/src/doc/en/developer/walk_through.rst b/src/doc/en/developer/walk_through.rst index bb1756cc668..da8a9b79efe 100644 --- a/src/doc/en/developer/walk_through.rst +++ b/src/doc/en/developer/walk_through.rst @@ -89,6 +89,16 @@ packages of Sage:: [user@localhost sage]$ make +.. NOTE:: + + If your system supports multiprocessing and you want to use multiple + processors to build Sage, replace the last line above by:: + + [user@localhost sage]$ MAKE='make -jNUM' make + + to tell the ``make`` program to run ``NUM`` jobs in parallel when + building Sage. + .. NOTE:: Mac OS X allows changing directories without using exact capitalization. @@ -111,45 +121,49 @@ A branch is a copy (except that it doesn't take up twice the space) of the Sage source code where you can store your modifications to the Sage source code and which you can upload to trac tickets. -It is easy to create a new branch, just check out (switch to) the branch -from where you want to start (that is, ``master``) and use the ``git -branch`` command:: - - [user@localhost sage]$ git checkout master - [user@localhost sage]$ git branch last_twin_prime - [user@localhost sage]$ git checkout last_twin_prime - -You can list all branches using:: +To begin with, type the command ``git branch``. You will see the following:: [user@localhost]$ git branch + * develop master - * last_twin_prime The asterisk shows you which branch you are on. Without an argument, -the ``git branch`` command just displays a list of all local branches -with the current one marked by an asterisk. Also note that ``git -branch`` creates a new branch, but does not switch to it. For this, -you have to use ``git checkout``:: - - [user@localhost sage]$ git checkout master - Switched to branch 'master' - Your branch is up-to-date with 'github/master'. - [user@localhost sage]$ git branch - * master - last_twin_prime +the ``git branch`` command displays a list of all local branches +with the current one marked by an asterisk. + +It is easy to create a new branch; first make sure you are on the branch from +which you want to branch out. That is, if you are not currently on the +``develop`` branch, type the command ``git checkout develop``:: + + [user@localhost sage]$ git checkout develop + Switched to branch 'develop' + Your branch is up-to-date with 'origin/develop'. + +Then use the ``git branch`` command to create a new branch, as follows:: + + [user@localhost sage]$ git branch last_twin_prime + +Also note that ``git branch`` creates a new branch, but does not switch +to it. For this, you have to use ``git checkout``:: + [user@localhost sage]$ git checkout last_twin_prime Switched to branch 'last_twin_prime' -Note that, unless you explicitly upload ("push") a branch to remote -git repository, the local branch will only be on your computer and not -visible to anyone else. +Now if you use the command ``git branch``, you will see the following:: + + [user@localhost]$ git branch + develop + * last_twin_prime + master + +Note that unless you explicitly upload ("push") a branch to a remote +git repository, the branch is a local branch that is only on your computer +and not visible to anyone else. To avoid typing the new branch name twice you can use the shortcut ``git checkout -b my_new_branch`` to create and switch to the new branch in one command. - - .. _section_walkthrough_logs: The History @@ -188,7 +202,7 @@ you which files changed, and how to continue with recording the changes:: [user@localhost sage]$ git status - On branch master + On branch last_twin_prime Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) @@ -234,7 +248,17 @@ as if you were `installing Sage from scratch However, this time only packages which were changed (or which depend on a changed package) will be recompiled, so it shoud be much faster than compiling Sage -the first time. Rarely there are conflicts with other packages, +the first time. + +.. NOTE:: + + If you have `pulled a branch from trac + `_, + it may depend on changes to third-party packages, so ``./sage -br`` + may fail. If this happens (and you believe the code in this branch + should compile), try running ``make``. + +Rarely there are conflicts with other packages, or with the already-installed older version of the package that you changed, in that case you do have to recompile everything using:: diff --git a/src/doc/en/developer/workflows.rst b/src/doc/en/developer/workflows.rst index eca4356dfe0..58253e8a170 100644 --- a/src/doc/en/developer/workflows.rst +++ b/src/doc/en/developer/workflows.rst @@ -24,7 +24,7 @@ third person. Simple Workflow =============== -.. image:: static/flowchart.* +.. IMAGE:: static/flowchart.* :align: center diff --git a/src/doc/en/faq/faq-contribute.rst b/src/doc/en/faq/faq-contribute.rst index f5fa1de63bc..75e934b1357 100644 --- a/src/doc/en/faq/faq-contribute.rst +++ b/src/doc/en/faq/faq-contribute.rst @@ -147,7 +147,7 @@ resources can be found by a web search. `Python standard documentation `_ * `Snakefood `_ * `Sphinx `_ -* `XDot `_ +* `XDot `_ **Tutorials and books** diff --git a/src/doc/en/faq/faq-general.rst b/src/doc/en/faq/faq-general.rst index a6e3eedf801..7851a5262cf 100644 --- a/src/doc/en/faq/faq-general.rst +++ b/src/doc/en/faq/faq-general.rst @@ -188,7 +188,7 @@ functionalities are made possible through FOSS projects such as theory. * `Maxima `_ --- system for symbolic and numerical computation. -* `mpmath `_ --- a pure-Python +* `mpmath `_ --- a pure-Python library for multiprecision floating-point arithmetic. * `NumPy `_ --- numerical linear algebra and other numerical computing capabilities for Python. diff --git a/src/doc/en/faq/faq-usage.rst b/src/doc/en/faq/faq-usage.rst index 23bc727145d..241921bd20d 100644 --- a/src/doc/en/faq/faq-usage.rst +++ b/src/doc/en/faq/faq-usage.rst @@ -146,7 +146,7 @@ every change applied to the file simple.py will be automatically updated in Sage Can I use SageMath with Python 3.x? """"""""""""""""""""""""""""""""""" -Currently, no (November 2016). Work in progress aims to allow this in +Currently, no (February 2017). Work in progress aims to allow this in the not-so-far future. Until this task is completed, SageMath will continue to use Python 2.x. @@ -387,7 +387,29 @@ e.g. :: sage: list(map(ord, "Big Mac")) [66, 105, 103, 32, 77, 97, 99] +How can I wrote multiplication implicitly as in Mathematica? +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +Sage has a function that enables this:: + + sage: implicit_multiplication(True) + sage: x 2 x # Not tested + 2*x^2 + sage: implicit_multiplication(False) + +This is preparsed by Sage into Python code. It may not work in a +complicated situation. To see what the preparser does:: + + sage: implicit_multiplication(True) + sage: preparse("2 x") + 'Integer(2)*x' + sage: implicit_multiplication(False) + sage: preparse("2 x") + 'Integer(2) x' + +See https://wiki.sagemath.org/sage_mathematica for more information +about Mathematica vs. SageMath. + Can I make Sage automatically execute commands on startup? """""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -703,9 +725,15 @@ You will need to do this from the command line. Just run a command like this. * Linux (assuming you have Sage in ``/usr/bin``):: - env SAGE_BROWSER=opera /usr/bin/sage -notebook + env BROWSER=opera /usr/bin/sage --notebook + +* Mac (assuming you are in the directory of your downloaded Sage). + With the Jupyter notebook:: + + BROWSER='open -a Firefox %s' ./sage --notebook jupyter + BROWSER='open -a Google\ Chrome %s' ./sage --notebook jupyter -* Mac (assuming you are in the directory of your downloaded Sage):: + With the old SageNB notebook:: - SAGE_BROWSER='open -a Firefox' ./sage -notebook - SAGE_BROWSER='open -a Google\ Chrome' ./sage -notebook + BROWSER='open -a Firefox' ./sage --notebook + BROWSER='open -a Google\ Chrome' ./sage --notebook diff --git a/src/doc/en/installation/binary.rst b/src/doc/en/installation/binary.rst index 828140bd499..6d1fe8ddfb4 100644 --- a/src/doc/en/installation/binary.rst +++ b/src/doc/en/installation/binary.rst @@ -15,7 +15,8 @@ pre-built binaries. Assumptions: You have a computer with at least 2 GB of free disk space and the operating system is Linux (32-bit or 64-bit) or -OS X (10.4 or later). +OS X (10.4 or later). An SSL library (OpenSSL recommended) is +installed in your operating system. Highly Recommended: It is highly recommended that you have LaTeX installed. If you want to view animations, you should install either @@ -29,21 +30,36 @@ in a directory which you have permission to read and write:: tar zxvf sage-x.y.z-x86_64-Linux.tgz -You can move the resulting directory ``sage-x.y.z-x86_64-Linux`` +You can move the resulting directory ``SageMath`` anywhere and still run ``./sage`` from it, as long as the full path name -has **no spaces** in it. You can also copy the file ``sage`` from -that directory and put it anywhere, e.g., ``/usr/local/bin/``, but +has **no spaces** in it. The first time you run Sage, you will see a +message like + +:: + + Rewriting paths for your new installation directory + =================================================== + + This might take a few minutes but only has to be done once. + + patching ... (long list of files) + +At this point, you can no longer move your Sage installation and +expect Sage to function. + +You can also copy the file ``sage`` from +the ``SageMath`` directory and put it anywhere, e.g., ``/usr/local/bin/``, but then you have to edit the ``#SAGE_ROOT=/path/to/sage-version`` line at the top of the copied file ``/usr/local/bin/sage`` (you should not edit the original ``sage`` executable). The variable ``SAGE_ROOT`` should point to the directory -``sage-x.y.z-x86_64-Linux`` of the extracted Sage tarball. +``SageMath`` of the extracted Sage tarball. As long as ``/usr/local/bin`` is in your ``$PATH``, you can then type ``sage`` from the command line to run Sage. Another approach is to create a symbolic link, say -``/usr/local/bin/sage``, pointing to ``sage-x.y.z-x86_64-Linux/sage`` :: +``/usr/local/bin/sage``, pointing to ``SageMath/sage`` :: - ln -s /path/to/sage-x.y.z-x86_64-Linux/sage /usr/local/bin/sage + ln -s /path/to/SageMath/sage /usr/local/bin/sage With this approach, there is no need to edit ``/usr/local/bin/sage``, the ``SAGE_ROOT`` path will be discovered automatically thanks to the @@ -51,19 +67,9 @@ symbolic link. When you want to install a new version of Sage, just delete the old link and create a new one. -Any time you move the Sage directory, you may see a message like - -:: - - The Sage installation tree may have moved - (from /foo to /bar). - Changing various hardcoded paths... - (Please wait at most a few minutes.) - DO NOT INTERRUPT THIS. - -We currently distribute ``.dmg`` files for OS X 10.4.x and 10.6.x. But +We currently distribute ``.dmg`` files for recent versions of OS X, but we would like to make Sage more of a native application. Work for that -is ongoing, but help is always welcome. +is ongoing, and help is always welcome. Microsoft Windows diff --git a/src/doc/en/installation/source.rst b/src/doc/en/installation/source.rst index 2fc61c33f0a..f5a94761ebf 100644 --- a/src/doc/en/installation/source.rst +++ b/src/doc/en/installation/source.rst @@ -9,6 +9,9 @@ Install from Source Code ======================== +.. contents:: Table of contents + :depth: 2 + More familiarity with computers may be required to build Sage from the `source code `_. If you do have all the :ref:`pre-requisite tools `, @@ -19,21 +22,21 @@ although the procedure is fully automated and should need no human intervention. Building Sage from the source code has the major advantage that your install -will be optimised for your particular computer and should therefore offer +will be optimized for your particular computer and should therefore offer better performance and compatibility than a binary install. Moreover, it offers you full development capabilities: you can change absolutely any part of Sage or the programs on which it depends, and recompile the modified parts. `Download the Sage source code `_ -or `check it out with git `_ (see also. -`the developers guide `_). -If you changed your mind, you can also download a -`binary distribution `_ -for some operating systems. +or get it from the `git repository `_. +Note: if you are installing Sage for development, you should rather follow +the instructions in +`The Sage Developer's Guide `_. -.. contents:: Table of contents - :depth: 2 +It is also possible to download a +`binary distribution `_ +for some operating systems, rather than compiling from source. Supported platforms ------------------- @@ -98,6 +101,33 @@ computer: - **tar**: GNU tar version 1.17 or later, or BSD tar. - **python**: Python >= 2.6. + +Libraries +^^^^^^^^^ + +Some Sage components (and among them, most notably, Python) *"use the +OpenSSL library for added performance if made available by the +operating system"* (literal quote from the Python license). Testing +has proved that : + + * Sage can be successfully built against other SSL libraries (at + least GnuTLS). + + * Sage's ``-pip`` facility (used to install some Sage packages) is + disabled when Sage is compiled against those libraries. + +Furthermore, the Sage license mention that the ``hashlib`` library +(used in Sage) uses OpenSSL. + +Therefore, the OpenSSL library is recommended. However, Sage's license +seems to clash with OpenSSL license, which makes the distribution of +OpenSSL along with Sage sources dubious. However, there is no problem +for Sage using a systemwide-installed OpenSSL library. + +In any case, you must install systemwide your chosen library and its +development files. + + Fortran and compiler suites ########################### @@ -186,21 +216,25 @@ you would use `apt-get `_:: # debian - sudo apt-get install binutils gcc make m4 perl tar git + sudo apt-get install binutils gcc make m4 perl tar git openssl libssl-dev # redhat - sudo yum install binutils gcc make m4 perl tar git perl-ExtUtils-MakeMaker + sudo yum install binutils gcc make m4 perl tar git \ + perl-ExtUtils-MakeMaker openssl openssl-devel to install all general requirements, or, if you don't want Sage to build its own GCC:: # debian - sudo apt-get install binutils gcc g++ gfortran make m4 perl tar git + sudo apt-get install binutils gcc g++ gfortran make m4 perl tar \ + git openssl libssl-dev # redhat - sudo yum install binutils gcc gcc-c++ gcc-gfortran make m4 perl tar git perl-ExtUtils-MakeMaker + sudo yum install binutils gcc gcc-c++ gcc-gfortran make m4 perl \ + tar git perl-ExtUtils-MakeMaker openssl openssl-devel -(This was tested on Ubuntu 12.04.2.) +(These examples suppose that you choose to use a systemwide OpenSSL +library. This was tested on Ubuntu 12.04.2.) On other Linux systems, you might use `rpm `_, `yum `_, @@ -303,7 +337,7 @@ Make sure you have C, C++, and Fortran compilers installed! Building all of Sage with Clang is currently not supported, see :trac:`12426`. -If you are interested in working on support for commerical compilers from +If you are interested in working on support for commercial compilers from `HP `_, `IBM `_, `Intel `_, @@ -320,7 +354,7 @@ Recommended programs The following programs are recommended. They are not strictly required at build time or at run time, -but provide additional capablities: +but provide additional capabilities: - **dvipng**. - **ffmpeg**. @@ -367,19 +401,15 @@ or to use `OpenID `_ authentication, you need to follow specific installation steps described in :ref:`section_notebook_ssl`. -Although all necessary components are provided through Sage optional packages, -i.e. you can install a local version of `OpenSSL `_ -by using Sage's **openssl** package and running ``sage -i openssl`` as suggested -in :ref:`section_notebook_ssl` (this requires an Internet connection), -you might prefer to install OpenSSL and the OpenSSL development headers -globally on your system. - -On Linux systems, those are usually provided by the **libssl** and -**libssl-dev** packages and can be installed using:: - - sudo apt-get install libssl libssl-dev - -or similar commands. +Although all necessary components are provided through Sage optional +packages, i.e., even if you choose not to install a systemwide version +of OpenSSL, you can install a local (Sage_specific) version of +`OpenSSL `_ by using Sage's **openssl** +package and running ``sage -i openssl`` as suggested in +:ref:`section_notebook_ssl` (this requires an Internet +connection). Alternatively, you might prefer to install OpenSSL and +the OpenSSL development headers globally on your system, as described +above. Finally, if you intend to distribute the notebook load onto several Sage servers, you will surely want to setup an @@ -457,10 +487,9 @@ Running Sage from a directory with spaces in its name will also fail. fast filesystem, avoiding `NFS `_ and the like. On personal computers, any subdirectory of your :envvar:`HOME` directory - should do. - The directory where you built Sage is **NOT** hardcoded. - You should be able to safely move or rename that directory. - (It's a bug if this is not the case.) + should do. Note that once you have built Sage (by running ``make``, + as described below), you will not be able to move or rename its + directory without likely breaking Sage. #. Extract the tarfile:: @@ -542,7 +571,7 @@ Running Sage from a directory with spaces in its name will also fail. we appreciate everything.) See :ref:`section_make` for some targets for the ``make`` command, - :ref:`section_envvar` for additional informatio on useful environment + :ref:`section_envvar` for additional information on useful environment variables used by Sage, and :ref:`section_notebook_ssl` for additional instruction on how to build the notebook with SSL support. @@ -898,6 +927,15 @@ Here are some of the more commonly used variables affecting the build process: parallel testing: there we use a default of the number of CPU cores, with a maximum of 8 and a minimum of 2). +- :envvar:`V` - if set to ``0``, silence the build. Instead of + showing a detailed compilation log, only one line of output is shown + at the beginning and at the end of the installation of each Sage + package. To see even less output, use:: + + make -s V=0 + + (Note that the above uses the syntax of setting a Makefile variable.) + - :envvar:`SAGE_CHECK` - if set to ``yes``, then during the build process, or when installing packages manually, run the test suite for each package which has one. @@ -1000,7 +1038,7 @@ Here are some of the more commonly used variables affecting the build process: you run ``make``, ``make doc``, or ``make doc-pdf``. For example, you can add ``--no-plot`` to this variable to avoid building the graphics coming from the ``.. PLOT`` directive within the documentation, - or you can add ``--no-tests`` to omit all "TESTS" blocks in the + or you can add ``--include-tests-blocks`` to include all "TESTS" blocks in the reference manual. Run ``sage --docbuild help`` to see the full list of options. @@ -1082,6 +1120,19 @@ Here are some of the more commonly used variables affecting the build process: supports :envvar:`SAGE_SUDO`, into a root-owned installation hierarchy (:envvar:`SAGE_LOCAL`). +- :envvar:`SAGE_PYTHON3` - set this to ``yes`` to build Sage using + Python 3 rather than Python 2. + + .. WARNING:: + + This will probably break your Sage installation! + + .. WARNING:: + + This environment variable may not be supported in future versions + of Sage; it may be replaced by (for example) ``configure`` + options. + Variables to set if you're trying to build Sage with an unusual setup, e.g., an unsupported machine or an unusual compiler: @@ -1239,7 +1290,7 @@ Sage uses the following environment variables when it runs: - :envvar:`SAGE_PATH` - a colon-separated list of directories which Sage searches when trying to locate Python libraries. -- :envvar:`SAGE_BROWSER` - on most platforms, Sage will detect the command to +- :envvar:`BROWSER` - on most platforms, Sage will detect the command to run a web browser, but if this doesn't seem to work on your machine, set this variable to the appropriate command. @@ -1247,7 +1298,7 @@ Sage overrides the user's settings of the following variables: - :envvar:`MPLCONFIGDIR` - ordinarily, this variable lets the user set their matplotlib config directory. - Due to incompatibilies in the contents of this directory among different + Due to incompatibilities in the contents of this directory among different versions of matplotlib, Sage overrides the user's setting, defining it instead to be :file:`$DOT_SAGE/matplotlib-VER`, with ``VER`` replaced by the current matplotlib version number. @@ -1413,4 +1464,4 @@ would be appropriate if you have a Core i3/5/7 processor with AVX support. -**This page was last updated in July 2016 (Sage 7.3).** +**This page was last updated in February 2017 (Sage 7.6).** diff --git a/src/doc/en/prep/Advanced-2DPlotting.rst b/src/doc/en/prep/Advanced-2DPlotting.rst index a73dc1daa78..00967b9e683 100644 --- a/src/doc/en/prep/Advanced-2DPlotting.rst +++ b/src/doc/en/prep/Advanced-2DPlotting.rst @@ -562,7 +562,7 @@ Sage includes a variety of built\-in graphics objects. These are particularly useful for adding to one's plot certain objects which are difficult to describe with equations, but which are basic geometric objects nonetheless. In this section we will try to demonstrate the -syntax of some of the most useful of them; for most of the the +syntax of some of the most useful of them; for most of them the contextual (remember, append ``?``) help will give more details. Points diff --git a/src/doc/en/prep/Quickstarts/NumAnalysis.rst b/src/doc/en/prep/Quickstarts/NumAnalysis.rst index dd5c180f24d..69e27e51b9b 100644 --- a/src/doc/en/prep/Quickstarts/NumAnalysis.rst +++ b/src/doc/en/prep/Quickstarts/NumAnalysis.rst @@ -282,7 +282,7 @@ Scipy (included in Sage) has a lot of numerical algorithms. See `the Scipy docs `_. Mpmath is also included in Sage, and contains a huge amount of numerical -stuff. See `the mpmath codebase `_. +stuff. See `the mpmath codebase `_. The `Decimal python module `_ has also been useful for diff --git a/src/doc/en/reference/algebras/index.rst b/src/doc/en/reference/algebras/index.rst index 4ef74f60188..411fcac0f90 100644 --- a/src/doc/en/reference/algebras/index.rst +++ b/src/doc/en/reference/algebras/index.rst @@ -42,6 +42,7 @@ Named associative algebras sage/algebras/affine_nil_temperley_lieb sage/combinat/diagram_algebras sage/algebras/clifford_algebra + sage/algebras/cluster_algebra sage/combinat/descent_algebra sage/algebras/hall_algebra sage/algebras/iwahori_hecke_algebra @@ -52,6 +53,7 @@ Named associative algebras sage/algebras/orlik_solomon sage/combinat/partition_algebra sage/algebras/quatalg/quaternion_algebra + sage/algebras/rational_cherednik_algebra sage/algebras/schur_algebra sage/algebras/steenrod/steenrod_algebra sage/algebras/steenrod/steenrod_algebra_bases @@ -68,6 +70,7 @@ Various associative algebras sage/algebras/associated_graded sage/algebras/commutative_dga + sage/algebras/q_system Non-associative algebras ------------------------ diff --git a/src/doc/en/reference/calculus/index.rst b/src/doc/en/reference/calculus/index.rst index 0cf63484e39..2c235410b09 100644 --- a/src/doc/en/reference/calculus/index.rst +++ b/src/doc/en/reference/calculus/index.rst @@ -24,13 +24,13 @@ Symbolic Calculus sage/symbolic/complexity_measures sage/calculus/wester sage/calculus/desolvers - sage/gsl/dwt - sage/gsl/dft - sage/gsl/fft - sage/gsl/ode - sage/gsl/integration + sage/calculus/transforms/dwt + sage/calculus/transforms/dft + sage/calculus/transforms/fft + sage/calculus/ode + sage/calculus/integration sage/calculus/riemann - sage/gsl/interpolation + sage/calculus/interpolation sage/calculus/interpolators sage/calculus/functions sage/calculus/var diff --git a/src/doc/en/reference/categories/index.rst b/src/doc/en/reference/categories/index.rst index 792556f27c7..fabfe4c465b 100644 --- a/src/doc/en/reference/categories/index.rst +++ b/src/doc/en/reference/categories/index.rst @@ -158,6 +158,7 @@ Individual Categories sage/categories/sets_with_partial_maps sage/categories/shephard_groups sage/categories/simplicial_complexes + sage/categories/simplicial_sets sage/categories/super_algebras sage/categories/super_algebras_with_basis sage/categories/super_hopf_algebras_with_basis diff --git a/src/doc/en/reference/coding/index.rst b/src/doc/en/reference/coding/index.rst index eacbbf46b0f..aca7d9def46 100644 --- a/src/doc/en/reference/coding/index.rst +++ b/src/doc/en/reference/coding/index.rst @@ -3,87 +3,115 @@ Coding Theory ============= -Abstract classes, catalogs and databases ----------------------------------------- +Basic Coding Theory objects +--------------------------- + .. toctree:: - :maxdepth: 2 + :maxdepth: 1 + sage/coding/linear_code + sage/coding/channel_constructions sage/coding/decoder sage/coding/encoder - sage/coding/bounds_catalog + +Catalogs +-------- + +.. toctree:: + :maxdepth: 2 + sage/coding/channels_catalog sage/coding/codes_catalog sage/coding/decoders_catalog sage/coding/encoders_catalog + sage/coding/bounds_catalog sage/coding/databases sage/coding/two_weight_db -Linear codes and related constructions ---------------------------------------- +Code constructions +------------------ .. toctree:: :maxdepth: 1 sage/coding/linear_code + +The named code families below are represented in Sage by their own classes, +allowing specialised implementations of e.g. decoding or computation of properties: + +.. toctree:: + :maxdepth: 2 + sage/coding/grs sage/coding/hamming_code - sage/coding/guruswami_sudan/gs_decoder - sage/coding/guruswami_sudan/interpolation - sage/coding/guruswami_sudan/utils - sage/coding/subfield_subcode - sage/coding/code_constructions - sage/coding/punctured_code - sage/coding/extended_code - sage/coding/self_dual_codes - sage/coding/guava - sage/coding/binary_code + sage/coding/golay_code + sage/coding/parity_check_code sage/coding/reed_muller_code + sage/coding/cyclic_code + sage/coding/bch -Bounds on codes ---------------- +In contrast, for some code families Sage can only construct their generator +matrix and has no other a priori knowledge on them: .. toctree:: :maxdepth: 1 - sage/coding/code_bounds - sage/coding/delsarte_bounds + sage/coding/code_constructions + sage/coding/guava + sage/coding/self_dual_codes + sage/coding/binary_code -Channels and related constructions ----------------------------------- +Derived Code Constructions +-------------------------- + +Sage supports the following derived code constructions. If the constituent code +is from a special code family, the derived codes inherit e.g. decoding or +minimum distance capabilities: .. toctree:: :maxdepth: 2 - sage/coding/channel_constructions + sage/coding/subfield_subcode + sage/coding/punctured_code + sage/coding/extended_code + +Other derived constructions that simply produce the modified generator matrix +can be found among the methods of a constructed code. + +Methods and Operations related to Linear Codes +---------------------------------------------- -Source coding -------------- .. toctree:: - :maxdepth: 1 + :maxdepth: 2 - sage/coding/source_coding/huffman + sage/coding/codecan/codecan + sage/coding/codecan/autgroup_can_label -Canonical forms ---------------- +Source coding +------------- .. toctree:: :maxdepth: 1 - sage/coding/codecan/codecan - sage/coding/codecan/autgroup_can_label + sage/coding/source_coding/huffman -Other tools ------------ +Other modules +------------- .. toctree:: :maxdepth: 1 sage/coding/relative_finite_field_extension + sage/coding/guruswami_sudan/gs_decoder + sage/coding/guruswami_sudan/interpolation + sage/coding/guruswami_sudan/utils + sage/coding/code_bounds + sage/coding/delsarte_bounds Deprecated modules ------------------- +---------------------------- .. toctree:: :maxdepth: 1 diff --git a/src/doc/en/reference/coercion/index.rst b/src/doc/en/reference/coercion/index.rst index adf55c71779..a71ef9c6eba 100644 --- a/src/doc/en/reference/coercion/index.rst +++ b/src/doc/en/reference/coercion/index.rst @@ -35,7 +35,7 @@ nonsense. Here are some examples:: sage: GF(5)(1) + CC(I) Traceback (most recent call last): ... - TypeError: unsupported operand parent(s) for '+': 'Finite Field of size 5' and 'Complex Field with 53 bits of precision' + TypeError: unsupported operand parent(s) for +: 'Finite Field of size 5' and 'Complex Field with 53 bits of precision' Parents and Elements ~~~~~~~~~~~~~~~~~~~~ @@ -88,7 +88,7 @@ to be able to reason with them, so their type is used instead:: sage: a = int(10) sage: parent(a) - + <... 'int'> In fact, under the hood, a special kind of parent "The set of all Python objects of type T" is used in these cases. @@ -487,7 +487,7 @@ That's all there is to it. Now we can test it out: sage: R(1/2) + 1/7 Traceback (most recent call last): ... - TypeError: unsupported operand parent(s) for '+': 'Integer Ring localized at [2]' and 'Rational Field' + TypeError: unsupported operand parent(s) for +: 'Integer Ring localized at [2]' and 'Rational Field' sage: R(3/4) * 7 LocalElt(21/4) diff --git a/src/doc/en/reference/combinat/module_list.rst b/src/doc/en/reference/combinat/module_list.rst index 6dfd9faf2bd..74bcbf1ec98 100644 --- a/src/doc/en/reference/combinat/module_list.rst +++ b/src/doc/en/reference/combinat/module_list.rst @@ -119,6 +119,7 @@ Comprehensive Module list sage/combinat/gelfand_tsetlin_patterns sage/combinat/graph_path sage/combinat/gray_codes + sage/combinat/growth sage/combinat/hall_polynomial sage/combinat/integer_lists/base sage/combinat/integer_lists/lists @@ -157,6 +158,7 @@ Comprehensive Module list sage/combinat/ordered_tree sage/combinat/output sage/combinat/parking_functions + sage/combinat/plane_partition sage/combinat/partition sage/combinat/partition_algebra sage/combinat/partition_tuple diff --git a/src/doc/en/reference/geometry/conf.py b/src/doc/en/reference/discrete_geometry/conf.py similarity index 100% rename from src/doc/en/reference/geometry/conf.py rename to src/doc/en/reference/discrete_geometry/conf.py diff --git a/src/doc/en/reference/geometry/index.rst b/src/doc/en/reference/discrete_geometry/index.rst similarity index 69% rename from src/doc/en/reference/geometry/index.rst rename to src/doc/en/reference/discrete_geometry/index.rst index c8f68c2892f..e59cbd0d2ae 100644 --- a/src/doc/en/reference/geometry/index.rst +++ b/src/doc/en/reference/discrete_geometry/index.rst @@ -1,90 +1,113 @@ -Geometry -======== +Combinatorial and Discrete Geometry +=================================== -Combinatorial Geometry ----------------------- +Sage includes classes for hyperplane arrangements, polyhedra, toric varieties +(including polyhedral cones and fans), triangulations and some other helper +classes and functions. -Sage includes classes for convex rational polyhedral cones and fans, Groebner -fans, lattice and reflexive polytopes (with integral coordinates), and generic -polytopes and polyhedra (with rational or numerical coordinates). +Hyperplane arrangements +----------------------- .. toctree:: :maxdepth: 1 - sage/geometry/toric_lattice - sage/geometry/cone - sage/geometry/fan - sage/geometry/fan_morphism - sage/geometry/point_collection - sage/geometry/toric_plotter + sage/geometry/hyperplane_arrangement/arrangement + sage/geometry/hyperplane_arrangement/library + sage/geometry/hyperplane_arrangement/hyperplane + sage/geometry/hyperplane_arrangement/affine_subspace + sage/geometry/hyperplane_arrangement/plot - sage/rings/polynomial/groebner_fan +Polyhedral computations +----------------------- - sage/geometry/lattice_polytope +Polyhedra +~~~~~~~~~ + +.. toctree:: + :maxdepth: 1 + sage/geometry/polyhedron/library sage/geometry/polyhedron/constructor sage/geometry/polyhedron/parent sage/geometry/polyhedron/representation - sage/geometry/polyhedron/library sage/geometry/polyhedron/plot sage/geometry/polyhedron/face sage/geometry/polyhedron/cdd_file_format + +Lattice polyhedra +~~~~~~~~~~~~~~~~~ + +.. toctree:: + :maxdepth: 1 + + sage/geometry/lattice_polytope sage/geometry/polyhedron/lattice_euclidean_group_element sage/geometry/polyhedron/palp_database sage/geometry/polyhedron/ppl_lattice_polygon sage/geometry/polyhedron/ppl_lattice_polytope - sage/geometry/polytope - - sage/geometry/pseudolines - - sage/geometry/triangulation/point_configuration - sage/geometry/triangulation/base - sage/geometry/triangulation/element +Toric geometry +~~~~~~~~~~~~~~ - sage/geometry/hyperplane_arrangement/arrangement - sage/geometry/hyperplane_arrangement/library - sage/geometry/hyperplane_arrangement/hyperplane - sage/geometry/hyperplane_arrangement/affine_subspace - sage/geometry/hyperplane_arrangement/plot - - sage/geometry/linear_expression - - sage/geometry/newton_polygon +.. toctree:: + :maxdepth: 1 - sage/geometry/ribbon_graph + sage/geometry/toric_lattice + sage/geometry/cone + sage/geometry/fan + sage/geometry/fan_morphism + sage/geometry/point_collection + sage/geometry/toric_plotter + sage/rings/polynomial/groebner_fan -Hyperbolic Geometry -------------------- +Base classes for polyhedra +~~~~~~~~~~~~~~~~~~~~~~~~~~ .. toctree:: :maxdepth: 1 - sage/geometry/hyperbolic_space/hyperbolic_point - sage/geometry/hyperbolic_space/hyperbolic_isometry - sage/geometry/hyperbolic_space/hyperbolic_geodesic - sage/geometry/hyperbolic_space/hyperbolic_model - sage/geometry/hyperbolic_space/hyperbolic_interface + sage/geometry/polyhedron/base + sage/geometry/polyhedron/base_QQ + sage/geometry/polyhedron/base_ZZ + sage/geometry/polyhedron/base_RDF -Backends for Polyhedral Computations ------------------------------------- +Backends for Polyhedra +~~~~~~~~~~~~~~~~~~~~~~ .. toctree:: :maxdepth: 1 sage/geometry/polyhedron/backend_cdd - sage/geometry/polyhedron/backend_ppl sage/geometry/polyhedron/backend_field + sage/geometry/polyhedron/backend_normaliz + sage/geometry/polyhedron/backend_ppl sage/geometry/polyhedron/double_description sage/geometry/polyhedron/double_description_inhomogeneous - sage/geometry/polyhedron/base - sage/geometry/polyhedron/base_QQ - sage/geometry/polyhedron/base_ZZ - sage/geometry/polyhedron/base_RDF - -Internals ---------- + +Triangulations +-------------- + +.. toctree:: + :maxdepth: 1 + + sage/geometry/triangulation/point_configuration + sage/geometry/triangulation/base + sage/geometry/triangulation/element + +Miscellaneous +------------- + +.. toctree:: + :maxdepth: 1 + + sage/geometry/linear_expression + sage/geometry/newton_polygon + sage/geometry/ribbon_graph + sage/geometry/pseudolines + +Helper functions +---------------- .. toctree:: :maxdepth: 1 diff --git a/src/doc/en/reference/graphs/index.rst b/src/doc/en/reference/graphs/index.rst index 2f5026c17bd..b9e952d0319 100644 --- a/src/doc/en/reference/graphs/index.rst +++ b/src/doc/en/reference/graphs/index.rst @@ -96,5 +96,6 @@ Libraries of algorithms sage/graphs/tutte_polynomial sage/graphs/partial_cube sage/graphs/generic_graph_pyx + sage/graphs/orientations .. include:: ../footer.txt diff --git a/src/doc/en/reference/homology/index.rst b/src/doc/en/reference/homology/index.rst index f2e83c0389f..bf98e0841fd 100644 --- a/src/doc/en/reference/homology/index.rst +++ b/src/doc/en/reference/homology/index.rst @@ -3,8 +3,8 @@ Cell complexes and their homology Sage includes some tools for algebraic topology: from the algebraic side, chain complexes and their homology, and from the topological -side, simplicial complexes, `\Delta`-complexes, and cubical -complexes. A class of generic cell complexes is also available, +side, simplicial complexes, `\Delta`-complexes, cubical complexes, and +simplicial sets. A class of generic cell complexes is also available, mainly for developers who want to use it as a base for other types of cell complexes. @@ -22,6 +22,11 @@ cell complexes. sage/homology/examples sage/homology/delta_complex sage/homology/cubical_complex + sage/homology/simplicial_set + sage/homology/simplicial_set_constructions + sage/homology/simplicial_set_examples + sage/homology/simplicial_set_catalog + sage/homology/simplicial_set_morphism sage/homology/cell_complex sage/homology/koszul_complex sage/homology/hochschild_complex diff --git a/src/doc/en/reference/hyperbolic_geometry/conf.py b/src/doc/en/reference/hyperbolic_geometry/conf.py new file mode 120000 index 00000000000..2bdf7e68470 --- /dev/null +++ b/src/doc/en/reference/hyperbolic_geometry/conf.py @@ -0,0 +1 @@ +../conf_sub.py \ No newline at end of file diff --git a/src/doc/en/reference/hyperbolic_geometry/index.rst b/src/doc/en/reference/hyperbolic_geometry/index.rst new file mode 100644 index 00000000000..45ede76a217 --- /dev/null +++ b/src/doc/en/reference/hyperbolic_geometry/index.rst @@ -0,0 +1,14 @@ +Hyperbolic Geometry +=================== + +.. toctree:: + :maxdepth: 1 + + sage/geometry/hyperbolic_space/hyperbolic_point + sage/geometry/hyperbolic_space/hyperbolic_isometry + sage/geometry/hyperbolic_space/hyperbolic_geodesic + sage/geometry/hyperbolic_space/hyperbolic_model + sage/geometry/hyperbolic_space/hyperbolic_interface + + +.. include:: ../footer.txt diff --git a/src/doc/en/reference/index.rst b/src/doc/en/reference/index.rst index b91e2858514..3b549dcb89e 100644 --- a/src/doc/en/reference/index.rst +++ b/src/doc/en/reference/index.rst @@ -83,7 +83,8 @@ Calculus Geometry and Topology --------------------- -* :doc:`Combinatorial Geometry ` +* :doc:`Combinatorial and Discrete Geometry ` +* :doc:`Hyperbolic Geometry ` * :doc:`Cell Complexes and their Homology ` * :doc:`Differential Forms ` * :doc:`Manifolds ` diff --git a/src/doc/en/reference/libs/index.rst b/src/doc/en/reference/libs/index.rst index 8ff977b8c05..9b0b6e96d9e 100644 --- a/src/doc/en/reference/libs/index.rst +++ b/src/doc/en/reference/libs/index.rst @@ -3,20 +3,18 @@ C/C++ Library Interfaces An underlying philosophy in the development of Sage is that it should provide unified library-level access to the some of the best -GPL'd C/C++ libraries. Currently Sage provides some access to -MWRANK, NTL, PARI, and Hanke, each of which are included with -Sage. +GPL'd C/C++ libraries. Sage provides access to many libraries which +are included with Sage. The interfaces are implemented via shared libraries and data is moved between systems purely in memory. In particular, there is no -interprocess interpreter parsing (e.g., ``expect``), +interprocess interpreter parsing (e.g., ``pexpect``), since everything is linked together and run as a single process. -This is much more robust and efficient than using -``expect``. +This is much more robust and efficient than using ``pexpect``. Each of these interfaces is used by other parts of Sage. For -example, mwrank is used by the elliptic curves module to compute -ranks of elliptic curves, and PARI is used for computation of class +example, eclib is used by the elliptic curves module to compute +ranks of elliptic curves and PARI is used for computation of class groups. It is thus probably not necessary for a casual user of Sage to be aware of the modules described in this chapter. @@ -30,6 +28,9 @@ to be aware of the modules described in this chapter. sage/libs/eclib/homspace sage/libs/eclib/constructor sage/libs/lcalc/lcalc_Lfunction + sage/libs/pari + sage/libs/pari/convert_sage + sage/rings/pari_ring sage/libs/ratpoints sage/libs/singular/function sage/libs/singular/function_factory @@ -48,7 +49,6 @@ to be aware of the modules described in this chapter. sage/libs/ntl/all sage/libs/libecm sage/libs/lrcalc/lrcalc - sage/rings/pari_ring sage/libs/readline sage/libs/gap/context_managers sage/libs/gap/gap_functions diff --git a/src/doc/en/reference/matrices/index.rst b/src/doc/en/reference/matrices/index.rst index 04af1a46cd6..b477e23ad9c 100644 --- a/src/doc/en/reference/matrices/index.rst +++ b/src/doc/en/reference/matrices/index.rst @@ -87,6 +87,7 @@ objects like operation tables (e.g. the multiplication table of a group). sage/matrix/matrix_complex_double_dense sage/matrix/matrix_complex_ball_dense + sage/matrix/matrix_polynomial_dense sage/matrix/matrix_mpolynomial_dense sage/matrix/operation_table @@ -106,6 +107,7 @@ objects like operation tables (e.g. the multiplication table of a group). sage/matrix/matrix_window sage/matrix/misc sage/matrix/symplectic_basis + sage/matrix/compute_J_ideal sage/matrix/benchmark diff --git a/src/doc/en/reference/plot3d/threejs.rst b/src/doc/en/reference/plot3d/threejs.rst index f1c688c00b7..d131c9c25f3 100644 --- a/src/doc/en/reference/plot3d/threejs.rst +++ b/src/doc/en/reference/plot3d/threejs.rst @@ -18,7 +18,10 @@ in the users's web browser. Interactivity includes on a touch pad The generated HTML file contains all data for the scene apart from the JavaScript library -and can be saved to disk for sharing or embedding in a web page. +and can be saved to disk for sharing or embedding in a web page. The option ``online`` +can be set to ``true`` to provide links to the required files in an online content delivery +network. Alternately the required files can be downloaded from the Three.js GitHub repository +and linked directly from the web server. Options currently supported by the viewer: @@ -36,6 +39,9 @@ Options currently supported by the viewer: - ``frame`` -- (default: True) Boolean determining whether frame is drawn +- ``online`` -- (default: False) Boolean determining whether the local standard package + files are replaced by links to an online content delivery network + - ``opacity`` -- (default: 1) numeric value for transparency of lines and surfaces - ``radius`` -- (default: None) numeric value for radius of lines; use to render diff --git a/src/doc/en/reference/plot3d/threejs_examples/helix.html b/src/doc/en/reference/plot3d/threejs_examples/helix.html index e1e12f5a2d5..c00e4ed0081 100644 --- a/src/doc/en/reference/plot3d/threejs_examples/helix.html +++ b/src/doc/en/reference/plot3d/threejs_examples/helix.html @@ -29,6 +29,8 @@ var options = {aspect_ratio: [1.0, 1.0, 1.0], decimals: 2, frame: true, axes: false, axes_labels: ['x', 'y', 'z']}; + var animate = false; + var lights = [{x:0, y:0, z:10}, {x:0, y:0, z:-10}]; for ( var i=0 ; i < lights.length ; i++ ) { var light = new THREE.DirectionalLight( 0xdddddd, 1 ); @@ -139,12 +141,14 @@ camera.lookAt( scene.position ); var controls = new THREE.OrbitControls( camera, renderer.domElement ); + controls.addEventListener( 'change', function() { if ( !animate ) render(); } ); window.addEventListener( 'resize', function() { renderer.setSize( window.innerWidth, window.innerHeight ); camera.aspect = window.innerWidth / window.innerHeight; camera.updateProjectionMatrix(); + if ( !animate ) render(); } ); @@ -217,9 +221,8 @@ function render() { - requestAnimationFrame( render ); + if ( animate ) requestAnimationFrame( render ); renderer.render( scene, camera ); - controls.update(); for ( var i=0 ; i < scene.children.length ; i++ ) { if ( scene.children[i].type === 'Sprite' ) { @@ -232,6 +235,7 @@ } render(); + if ( !animate ) render(); diff --git a/src/doc/en/reference/plot3d/threejs_examples/spheres.html b/src/doc/en/reference/plot3d/threejs_examples/spheres.html index ee6bdbbfbb0..3f3a874b570 100644 --- a/src/doc/en/reference/plot3d/threejs_examples/spheres.html +++ b/src/doc/en/reference/plot3d/threejs_examples/spheres.html @@ -29,6 +29,8 @@ var options = {aspect_ratio: [1.0, 1.0, 1.0], decimals: 2, frame: true, axes: false, axes_labels: ['x', 'y', 'z']}; + var animate = false; + var lights = [{x:0, y:0, z:10}, {x:0, y:0, z:-10}]; for ( var i=0 ; i < lights.length ; i++ ) { var light = new THREE.DirectionalLight( 0xdddddd, 1 ); @@ -139,12 +141,14 @@ camera.lookAt( scene.position ); var controls = new THREE.OrbitControls( camera, renderer.domElement ); + controls.addEventListener( 'change', function() { if ( !animate ) render(); } ); window.addEventListener( 'resize', function() { renderer.setSize( window.innerWidth, window.innerHeight ); camera.aspect = window.innerWidth / window.innerHeight; camera.updateProjectionMatrix(); + if ( !animate ) render(); } ); @@ -217,9 +221,8 @@ function render() { - requestAnimationFrame( render ); + if ( animate ) requestAnimationFrame( render ); renderer.render( scene, camera ); - controls.update(); for ( var i=0 ; i < scene.children.length ; i++ ) { if ( scene.children[i].type === 'Sprite' ) { @@ -232,6 +235,7 @@ } render(); + if ( !animate ) render(); diff --git a/src/doc/en/reference/polynomial_rings/index.rst b/src/doc/en/reference/polynomial_rings/index.rst index 4e40b497ed5..e21ca23e2c3 100644 --- a/src/doc/en/reference/polynomial_rings/index.rst +++ b/src/doc/en/reference/polynomial_rings/index.rst @@ -57,6 +57,7 @@ Laurent Polynomials sage/rings/polynomial/laurent_polynomial_ring sage/rings/polynomial/laurent_polynomial + sage/rings/polynomial/omega Infinite Polynomial Rings ------------------------- diff --git a/src/doc/en/reference/power_series/index.rst b/src/doc/en/reference/power_series/index.rst index 91deab9de00..cfdcab767b7 100644 --- a/src/doc/en/reference/power_series/index.rst +++ b/src/doc/en/reference/power_series/index.rst @@ -7,6 +7,7 @@ Power Series Rings sage/rings/power_series_ring sage/rings/power_series_ring_element sage/rings/power_series_poly + sage/rings/power_series_pari sage/rings/multi_power_series_ring sage/rings/multi_power_series_ring_element diff --git a/src/doc/en/reference/probability/index.rst b/src/doc/en/reference/probability/index.rst index ba20725853c..633219bddbf 100644 --- a/src/doc/en/reference/probability/index.rst +++ b/src/doc/en/reference/probability/index.rst @@ -4,7 +4,7 @@ Probability .. toctree:: :maxdepth: 2 - sage/gsl/probability_distribution + sage/probability/probability_distribution sage/probability/random_variable .. include:: ../footer.txt diff --git a/src/doc/en/reference/references/index.rst b/src/doc/en/reference/references/index.rst index b81043df27b..a2010e67e33 100644 --- a/src/doc/en/reference/references/index.rst +++ b/src/doc/en/reference/references/index.rst @@ -76,6 +76,10 @@ REFERENCES: .. [Ap1997] \T. Apostol, Modular functions and Dirichlet series in number theory, Springer, 1997 (2nd ed), section 3.7--3.9. +.. [APR2001] George E. Andrews, Peter Paule, Axel Riese, + *MacMahon's partition analysis: the Omega package*, + European J. Combin. 22 (2001), no. 7, 887--904. + .. [Ar2006] D. Armstrong. *Generalized noncrossing partitions and combinatorics of Coxeter groups*. Mem. Amer. Math. Soc., 2006. @@ -180,6 +184,10 @@ REFERENCES: 203–218. Springer, 2010. pre-print available at http://eprint.iacr.org/2010/313.pdf +.. [BDP2013] Thomas Brüstle, Grégoire Dupont, Matthieu Pérotin + *On Maximal Green Sequences* + :arxiv:`1205.2050` + .. [Bee] Robert A. Beezer, *A First Course in Linear Algebra*, http://linear.ups.edu/. Accessed 15 July 2010. @@ -188,6 +196,13 @@ REFERENCES: Memoirs of the American Mathematical Society, vol. 192 (2008); :doi:`10.1090/memo/0900`; :arxiv:`math/0502168` +.. [Ber1991] \C. Berger, "Une version effective du théorème de + Hurewicz", https://tel.archives-ouvertes.fr/tel-00339314/en/. + +.. [BFZ2005] \A. Berenstein, \S. Fomin, and \A. Zelevinsky, *Cluster + algebras. III. Upper bounds and double Bruhat cells*, + Duke Math. J. 126 (2005), no. 1, 1–52. + .. [BG1985] \M. Blum and S. Goldwasser. An Efficient Probabilistic Public-Key Encryption Scheme Which Hides All Partial Information. In *Proceedings of CRYPTO 84 on Advances in @@ -232,6 +247,9 @@ REFERENCES: (arxiv:0710.5614) to appear in Ergodic Theory and Dynamical Systems. +.. [BM2008] John Adrian Bondy and U.S.R. Murty, "Graph theory", Volume + 244 of Graduate Texts in Mathematics, 2nd edition, Springer, 2008. + .. [BM2003] Bazzi and Mitter, {\it Some constructions of codes from group actions}, (preprint March 2003, available on Mitter's MIT website). @@ -259,6 +277,10 @@ REFERENCES: Theory and its Applications, 1 (2015), 83–96. :arxiv:`1406.5337` +.. [BPRS2009] \J. Bastian, \T. Prellberg, \M. Rubey, \C. Stump, *Counting the + number of elements in the mutation classes of `\tilde{A}_n`-quivers*, + :arxiv:`0906.0487` + .. [Br1910] Bruckner, "Uber die Ableitung der allgemeinen Polytope und die nach Isomorphismus verschiedenen Typen der allgemeinen Achtzelle (Oktatope)", Verhand. Konik. Akad. Wetenschap, @@ -329,6 +351,11 @@ REFERENCES: Secret. Cryptology ePrint Archive, Report 2013/164. 2013. 2013/164. http://eprint.iacr.org/2013/164 +.. [CGMRV16] A. Conte, R. Grossi, A. Marino, R. Rizzi, L. Versari, + "Directing Road Networks by Listing Strong Orientations.", + Combinatorial Algorithms, Proceedings of 27th International Workshop, + IWOCA 2016, August 17-19, 2016, pages 83--95. + .. [Ch2012] Cho-Ho Chu. *Jordan Structures in Geometry and Analysis*. Cambridge University Press, New York. 2012. IBSN 978-1-107-01617-0. @@ -450,6 +477,10 @@ REFERENCES: manifolds", J. Indian Inst. Sci. 87 (2007), no. 4, 429-449. +.. [Dav1997] B.A. Davey, H.A. Priestley, + *Introduction to Lattices and Order*, + Cambridge University Press, 1997. + .. [DDLL2013] Léo Ducas, Alain Durmus, Tancrède Lepoint and Vadim Lyubashevsky. *Lattice Signatures and Bimodal Gaussians*; in Advances in Cryptology – CRYPTO 2013; @@ -567,6 +598,10 @@ REFERENCES: Version 1.3". 2013. http://www.wolfgang-ehrhardt.de/specialfunctions.pdf. +.. [EM2001] Pavel Etingof and Xiaoguang Ma. + *Lecture notes on Cherednik algebras*. + http://www-math.mit.edu/~etingof/73509.pdf :arXiv:`1001.0432`. + .. [EP2013] David Einstein, James Propp. *Combinatorial, piecewise-linear, and birational homomesy for products of two chains*. :arxiv:`1310.5294v1`. @@ -624,6 +659,10 @@ REFERENCES: algebra". Proceedings of the seventeenth annual ACM symposium on Theory of computing. ACM, 1985. +.. [FST2012] \A. Felikson, \M. Shapiro, and \P. Tumarkin, *Cluster Algebras of + Finite Mutation Type Via Unfoldings*, Int Math Res Notices (2012) + 2012 (8): 1768-1804. + .. [Fu1993] Wiliam Fulton, *Introduction to Toric Varieties*, Princeton University Press, 1993. @@ -631,6 +670,9 @@ REFERENCES: toric varieties defined by atomic lattices*. Inventiones Mathematicae. **155** (2004), no. 3, pp. 515-536. +.. [FZ2007] \S. Fomin and \A. Zelevinsky, *Cluster algebras IV. Coefficients*, + Compos. Math. 143 (2007), no. 1, 112-164. + .. _ref-G: **G** @@ -660,6 +702,10 @@ REFERENCES: Riemann surfaces and Dessins d'enfant*, (2011) London Mathematical Society, Student Text 79. +.. [GGOR2003] V. Ginzberg, N. Guay, E. Opdam, R. Rouquier. + *On the category `\mathcal{O}` for rational Cherednik algebras*. + Invent. Math. **154** (2003). :arxiv:`math/0212036`. + .. [GHJV1994] \E. Gamma, R. Helm, R. Johnson, J. Vlissides, *Design Patterns: Elements of Reusable Object-Oriented Software*. Addison-Wesley (1994). ISBN 0-201-63361-2. @@ -750,6 +796,9 @@ REFERENCES: .. [HJ2004] Tom Hoeholdt and Joern Justesen, A Course In Error-Correcting Codes, EMS, 2004 +.. [HKOTY1999] \G. Hatayama, A. Kuniba, M. Okado, T. Tagaki, and Y. Yamada, + *Remarks on fermionic formula*. Contemp. Math., **248** (1999). + .. [HKP2010] \T. J. Haines, R. E. Kottwitz, A. Prasad, Iwahori-Hecke Algebras, J. Ramanujan Math. Soc., 25 (2010), 113--145. :arxiv:`0309168v3` :mathscinet:`MR2642451` @@ -781,6 +830,10 @@ REFERENCES: Introduction to Mathematical Cryptography*. Springer, 2008. +.. [HR2016] Clemens Heuberger and Roswitha Rissner, "Computing + `J`-Ideals of a Matrix Over a Principal Ideal Domain", + :arxiv:`1611.10308`, 2016. + .. [Hsu1996] Tim Hsu, "Identifying congruence subgroups of the modular group", Proc. AMS 124, no. 5, 1351-1359 (1996) @@ -852,6 +905,9 @@ REFERENCES: .. [Kal1980] \T. Kaliath, "Linear Systems", Prentice-Hall, 1980, 383--386. +.. [Kan1958] \D. M. Kan, *A combinatorial definition of homotopy + groups*, Ann. Math. (2) 67 (1958), 282-312. + .. [KB1983] \W. Kühnel and T. F. Banchoff, "The 9-vertex complex projective plane", Math. Intelligencer 5 (1983), no. 3, 11-22. @@ -860,6 +916,14 @@ REFERENCES: actions, 2.2 p. 70. BI-Wissenschaftsverlag, Mannheim, 1991. +.. [Ke2008] \B. Keller, *Cluster algebras, quiver representations + and triangulated categories*, :arXiv:`0807.1960`. + +.. [KK1995] Victor Klee and Peter Kleinschmidt, + *Convex polytopes and related complexes.*, in \R. L. Graham, + \M. Grötschel, \L Lovász, *Handbook of combinatorics*, + Vol. 1, Chapter 18, 1995 + .. [KL2008] Chris Kurth and Ling Long, "Computations with finite index subgroups of `{\rm PSL}_2(\ZZ)` using Farey symbols", Advances in algebra and combinatorics, 225--242, World @@ -877,6 +941,10 @@ REFERENCES: Geometry*, vol. 1, Interscience Publishers (New York) (1963). +.. [KNS2011] Atsuo Kuniba and Tomoki Nakanishi and Junji Suzuki, + `T`-*systems and* `Y`-*systems in integrable systems*. + \J. Phys. A, **44** (2011), no. 10. + .. [KnotAtlas] The Knot atlas. http://katlas.org/wiki/Main_Page .. [Knu1995] Donald E. Knuth, *Overlapping Pfaffians*, @@ -998,6 +1066,9 @@ REFERENCES: .. [Lin1999] J. van Lint, Introduction to coding theory, 3rd ed., Springer-Verlag GTM, 86, 1999. +.. [LLZ2014] \K. Lee, \L. Li, and \A. Zelevinsky, *Greedy elements in rank 2 + cluster algebras*, Selecta Math. 20 (2014), 57-82. + .. [LM2006] Vadim Lyubashevsky and Daniele Micciancio. Generalized compact knapsacks are collision resistant. ICALP, pp. 144--155, Springer, 2006. @@ -1066,6 +1137,10 @@ REFERENCES: Atoms, Journal of Algebraic Combinatorics, Vol. 29, (2009), No. 3, p.295-313. :arXiv:`0707.4267` +.. [Mac1915] Percy A. MacMahon, *Combinatory Analysis*, + Cambridge University Press (1915--1916). + (Reprinted: Chelsea, New York, 1960). + .. [MAR2009] \H. Molina-Abril and P. Réal, *Homology computation using spanning trees* in Progress in Pattern Recognition, Image Analysis, Computer Vision, and Applications, Lecture @@ -1080,6 +1155,9 @@ REFERENCES: and of Hopf algebras; application to the Steenrod algebra." Thesis, Princeton Univ., 1964. +.. [May1967] \J. P. May, Simplicial Objects in Algebraic Topology, + University of Chicago Press (1967) + .. [McC1978] \K. McCrimmon. *Jordan algebras and their applications*. Bull. Amer. Math. Soc. **84** 1978. @@ -1095,11 +1173,18 @@ REFERENCES: Systèmes dynamiques/Dynamical Systems. :arxiv:`math/0304469v1` +.. [MM2015] \J. Matherne and \G. Muller, *Computing upper cluster algebras*, + Int. Math. Res. Not. IMRN, 2015, 3121-3149. + .. [Mon1998] \K. G. Monks, "Change of basis, monomial relations, and `P^s_t` bases for the Steenrod algebra," J. Pure Appl. Algebra 125 (1998), no. 1-3, 235-260. -.. [MR2002] S\. Murphy, M\. Robshaw *Essential Algebraic Structure +.. [MR1989] \G. Melançon and C. Reutenauer. + *Lyndon words, free algebras and shuffles*, + Can. J. Math., Vol. XLI, No. 4, 1989, pp. 577-591. + +.. [MR2002] \S. Murphy, M. Robshaw *Essential Algebraic Structure Within the AES*\; in Advances in Cryptology \- CRYPTO 2002\; LNCS 2442\; Springer Verlag 2002 @@ -1107,6 +1192,9 @@ REFERENCES: polynomial matrices", J. Symbolic Comput. 35 (2003), no. 4, 377--401 +.. [MS2011] \G. Musiker and \C. Stump, *A compendium on the cluster algebra + and quiver package in sage*, :arxiv:`1102.4844`. + .. [MSZ2013] Michael Maschler, Solan Eilon, and Zamir Shmuel. *Game Theory*. Cambridge: Cambridge University Press, (2013). ISBN 9781107005488. @@ -1148,6 +1236,11 @@ REFERENCES: Normaliz, http://www.mathematik.uni-osnabrueck.de/normaliz/ +.. [NZ2012] \T. Nakanishi and \A. Zelevinsky, *On tropical dualities in + cluster algebras*, Algebraic groups and quantum groups, + Contemp. Math., vol. 565, Amer. Math. Soc., + Providence, RI, 2012, pp. 217-226. + .. _ref-O: **O** @@ -1279,6 +1372,10 @@ REFERENCES: .. [Rio1958] \J. Riordan, "An Introduction to Combinatorial Analysis", Dover Publ. (1958) +.. [Ris2016] Roswitha Rissner, "Null ideals of matrices over residue + class rings of principal ideal domains". Linear Algebra + Appl., **494** (2016) 44–69. :doi:`10.1016/j.laa.2016.01.004`. + .. [RMA2009] \P. Réal and H. Molina-Abril, *Cell AT-models for digital volumes* in Torsello, Escolano, Brun (eds.), Graph-Based Representations in Pattern Recognition, Lecture Notes in @@ -1326,6 +1423,10 @@ REFERENCES: Springer (Berlin) (1992); :doi:`10.1007/978-3-540-70634-2` +.. [Ser2010] \F. Sergeraert, *Triangulations of complex projective + spaces* in Scientific contributions in honor of Mirian + Andrés Gómez, pp 507-519, Univ. La Rioja Serv. Publ., Logroño (2010). + .. [SH1995] \C. P. Schnorr and H. H. Hörner. *Attacking the Chor-Rivest Cryptosystem by Improved Lattice Reduction*. Advances in Cryptology - EUROCRYPT '95. LNCS @@ -1350,6 +1451,9 @@ REFERENCES: :doi:`10.1007/978-1-4684-9322-1`, ISBN 978-1-4684-9322-1. +.. [Spe2013] \D. Speyer, *An infinitely generated upper cluster algebra*, + :arxiv:`1305.6867`. + .. [SS1992] \M. A. Shtan'ko and M. I. Shtogrin, "Embedding cubic manifolds and complexes into a cubic lattice", *Uspekhi Mat. Nauk* 47 (1992), 219-220. @@ -1453,6 +1557,8 @@ REFERENCES: **V** +.. [Vat2008] \D. Vatne, *The mutation class of `D_n` quivers*, :arxiv:`0810.4789v1`. + .. [VB1996] \E. Viterbo, E. Biglieri. *Computing the Voronoi Cell of a Lattice: The Diamond-Cutting Algorithm*. IEEE Transactions on Information Theory, 1996. diff --git a/src/doc/en/reference/repl/environ.rst b/src/doc/en/reference/repl/environ.rst index 80e495cb40e..69d2858f5d8 100644 --- a/src/doc/en/reference/repl/environ.rst +++ b/src/doc/en/reference/repl/environ.rst @@ -27,7 +27,7 @@ Installation Guide for more about those.) - :envvar:`SAGE_PATH` -- a colon-separated list of directories which Sage searches when trying to locate Python libraries. -- :envvar:`SAGE_BROWSER` -- on most platforms, Sage will detect the +- :envvar:`BROWSER` -- on most platforms, Sage will detect the command to run a web browser, but if this doesn't seem to work on your machine, set this variable to the appropriate command. diff --git a/src/doc/en/reference/repl/index.rst b/src/doc/en/reference/repl/index.rst index eb5a575d6a8..e5bebd17899 100644 --- a/src/doc/en/reference/repl/index.rst +++ b/src/doc/en/reference/repl/index.rst @@ -92,6 +92,9 @@ Miscellaneous sage/repl/interpreter sage/repl/ipython_extension sage/repl/interface_magic + sage/repl/ipython_kernel/interact + sage/repl/ipython_kernel/widgets + sage/repl/ipython_kernel/widgets_sagenb sage/repl/ipython_kernel/install sage/repl/ipython_kernel/kernel sage/repl/ipython_tests diff --git a/src/doc/en/thematic_tutorials/coercion_and_categories.rst b/src/doc/en/thematic_tutorials/coercion_and_categories.rst index 017fcfe9e52..c692ae41096 100644 --- a/src/doc/en/thematic_tutorials/coercion_and_categories.rst +++ b/src/doc/en/thematic_tutorials/coercion_and_categories.rst @@ -537,8 +537,11 @@ fields instead of the category of fields:: sage: [p for p in dir(QuotientFields().parent_class) if p not in dir(Fields().parent_class)] [] sage: [p for p in dir(QuotientFields().element_class) if p not in dir(Fields().element_class)] - ['_derivative', 'denominator', 'derivative', 'factor', - 'numerator', 'partial_fraction_decomposition'] + ['_derivative', + 'denominator', + 'derivative', + 'numerator', + 'partial_fraction_decomposition'] .. end of output diff --git a/src/doc/en/thematic_tutorials/linear_programming.rst b/src/doc/en/thematic_tutorials/linear_programming.rst index d51174291b7..11f4c407660 100644 --- a/src/doc/en/thematic_tutorials/linear_programming.rst +++ b/src/doc/en/thematic_tutorials/linear_programming.rst @@ -353,7 +353,7 @@ Let us write the Sage code of this MILP:: :: sage: matching = p.get_values(matching) - sage: [e for e,b in matching.iteritems() if b == 1] # not tested + sage: [e for e, b in matching.items() if b == 1] # not tested [(0, 1), (6, 9), (2, 7), (3, 4), (5, 8)] diff --git a/src/doc/en/thematic_tutorials/profiling.rst b/src/doc/en/thematic_tutorials/profiling.rst index 384ab77d362..3a0c9db1937 100644 --- a/src/doc/en/thematic_tutorials/profiling.rst +++ b/src/doc/en/thematic_tutorials/profiling.rst @@ -115,7 +115,7 @@ C-level function calls: %crun With ``%crun``, you can obtain the list of all C functions involved in a computation, as well as the time spent on each of them. You will need to have -`the Google performance analysis tools `_ +`the Google performance analysis tools `_ installed on your system:: sage: %crun p=random_prime(2**500) diff --git a/src/doc/en/thematic_tutorials/sandpile.rst b/src/doc/en/thematic_tutorials/sandpile.rst index 36e5de57f46..5d45ad778c6 100644 --- a/src/doc/en/thematic_tutorials/sandpile.rst +++ b/src/doc/en/thematic_tutorials/sandpile.rst @@ -2257,7 +2257,7 @@ EXAMPLES:: sage: H.sink() (0, 0) sage: type(H.sink()) - + <... 'tuple'> --- diff --git a/src/doc/en/thematic_tutorials/tutorial-programming-python.rst b/src/doc/en/thematic_tutorials/tutorial-programming-python.rst index 24ef819e904..f8faf5a5c4e 100644 --- a/src/doc/en/thematic_tutorials/tutorial-programming-python.rst +++ b/src/doc/en/thematic_tutorials/tutorial-programming-python.rst @@ -1265,7 +1265,7 @@ You can return multiple values from a function:: :: sage: type(g) - + <... 'function'> :: @@ -1291,8 +1291,8 @@ in a function:: :: sage: h(1,2,3,n=4) - (1, 2, 3) - {'n': 4} + <... 'tuple'> (1, 2, 3) + <... 'dict'> {'n': 4} Let's use the *yield* instruction to make a generator for the Fibonacci numbers up to `n`:: diff --git a/src/doc/en/tutorial/interfaces.rst b/src/doc/en/tutorial/interfaces.rst index 2d18f4757cd..5a276310349 100644 --- a/src/doc/en/tutorial/interfaces.rst +++ b/src/doc/en/tutorial/interfaces.rst @@ -64,7 +64,7 @@ objects have different types: sage: type(gp('znprimroot(10007)')) sage: type(pari('znprimroot(10007)')) - + So which should you use? It depends on what you're doing. The GP interface can do absolutely anything you could do in the usual @@ -100,9 +100,9 @@ First we create a PARI list from a Python list. sage: v [1, 2, 3, 4, 5] sage: type(v) - + -Every PARI object is of type ``py_pari.gen``. The PARI type of the +Every PARI object is of type ``Gen``. The PARI type of the underlying object can be obtained using the ``type`` member function. @@ -114,7 +114,7 @@ function. In PARI, to create an elliptic curve we enter ``ellinit([1,2,3,4,5])``. Sage is similar, except that ``ellinit`` is a method that can be called on any PARI object, e.g., our -``t\_VEC v``. +``t_VEC`` `v`. :: diff --git a/src/doc/en/tutorial/introduction.rst b/src/doc/en/tutorial/introduction.rst index 71aed01cb94..493459163b0 100644 --- a/src/doc/en/tutorial/introduction.rst +++ b/src/doc/en/tutorial/introduction.rst @@ -93,7 +93,7 @@ computer. Here we merely make a few comments. will search. The documentation for using SageTeX is located in - ``$SAGE_ROOT/local/share/texmf/tex/generic/sagetex/``, where + ``$SAGE_ROOT/local/share/texmf/tex/latex/sagetex/``, where "``$SAGE_ROOT``" refers to the directory where you installed Sage -- for example, ``/opt/sage-4.2.1``. diff --git a/src/doc/en/tutorial/programming.rst b/src/doc/en/tutorial/programming.rst index f63c5099194..9c5f4d6a2d2 100644 --- a/src/doc/en/tutorial/programming.rst +++ b/src/doc/en/tutorial/programming.rst @@ -198,17 +198,17 @@ ints and floats, as illustrated: :: sage: s = "sage"; type(s) - + <... 'str'> sage: s = 'sage'; type(s) # you can use either single or double quotes - + <... 'str'> sage: s = [1,2,3,4]; type(s) - + <... 'list'> sage: s = (1,2,3,4); type(s) - + <... 'tuple'> sage: s = int(2006); type(s) - + <... 'int'> sage: s = float(2006); type(s) - + <... 'float'> To this, Sage adds many other types. E.g., vector spaces: @@ -288,7 +288,7 @@ elements of the list are indexed starting from :math:`0`: sage: v = [2, 3, 5, 'x', SymmetricGroup(3)]; v [2, 3, 5, 'x', Symmetric group of order 3! as a permutation group] sage: type(v) - + <... 'list'> sage: v[0] 2 sage: v[2] @@ -361,7 +361,7 @@ they can't be changed. sage: v = (1,2,3,4); v (1, 2, 3, 4) sage: type(v) - + <... 'tuple'> sage: v[1] = 5 Traceback (most recent call last): ... @@ -404,7 +404,7 @@ used: sage: list(v) [1, 2, 3, 4/5] sage: type(list(v)) - + <... 'list'> As another example, basis for vector spaces are immutable sequences, since it's important that you don't change them. @@ -440,7 +440,7 @@ arbitrary objects. sage: d = {1:5, 'sage':17, ZZ:GF(7)} sage: type(d) - + <... 'dict'> sage: d.keys() [1, 'sage', Integer Ring] sage: d['sage'] @@ -459,7 +459,7 @@ You can turn the above dictionary into a list with the same data: :: - sage: d.items() + sage: list(d.items()) [(1, 5), ('sage', 17), (Integer Ring, Finite Field of size 7)] A common idiom is to iterate through the pairs in a dictionary: @@ -467,7 +467,7 @@ A common idiom is to iterate through the pairs in a dictionary: :: sage: d = {2:4, 3:9, 4:16} - sage: [a*b for a, b in d.iteritems()] + sage: [a*b for a, b in d.items()] [8, 27, 64] A dictionary is unordered, as the last output illustrates. @@ -653,16 +653,6 @@ convert both numbers into the same type if possible: True True -Almost any two objects may be compared; there is no assumption that -the objects are equipped with a total ordering. - -:: - - sage: 2 < CC(3.1,1) - True - sage: 5 < VectorSpace(QQ,3) # output can be somewhat random - True - Use bool for symbolic inequalities: :: diff --git a/src/doc/en/tutorial/sagetex.rst b/src/doc/en/tutorial/sagetex.rst index b370cc31c77..4237e23e482 100644 --- a/src/doc/en/tutorial/sagetex.rst +++ b/src/doc/en/tutorial/sagetex.rst @@ -15,7 +15,7 @@ Here is a very brief example of using SageTeX. The full documentation can be found in ``SAGE_ROOT/local/share/doc/sagetex``, where ``SAGE_ROOT`` is the directory where your Sage installation is located. That directory contains the documentation and an example file. -See ``SAGE_ROOT/local/share/texmf/tex/generic/sagetex`` for +See ``SAGE_ROOT/local/share/texmf/tex/latex/sagetex`` for some possibly useful Python scripts. To see how SageTeX works, follow the directions for installing SageTeX (in @@ -120,7 +120,7 @@ installation aware of it before it will work. The key to this is that TeX needs to be able to find ``sagetex.sty``, which can be found in -``SAGE_ROOT/local/share/texmf/tex/generic/sagetex/``, where +``SAGE_ROOT/local/share/texmf/tex/latex/sagetex/``, where ``SAGE_ROOT`` is the directory where you built or installed Sage. If TeX can find ``sagetex.sty``, then SageTeX will work. There are several ways to accomplish this. diff --git a/src/doc/en/tutorial/tour_algebra.rst b/src/doc/en/tutorial/tour_algebra.rst index a6b88e8301e..f8c15fa142e 100644 --- a/src/doc/en/tutorial/tour_algebra.rst +++ b/src/doc/en/tutorial/tour_algebra.rst @@ -65,8 +65,7 @@ symbolically: sage: eq2 = q*y+p*x==-6 sage: eq3 = q*y^2+p*x^2==24 sage: solve([eq1,eq2,eq3,p==1],p,q,x,y) - [[p == 1, q == 8, x == -4/3*sqrt(10) - 2/3, y == 1/6*sqrt(5)*sqrt(2) - 2/3], - [p == 1, q == 8, x == 4/3*sqrt(10) - 2/3, y == -1/6*sqrt(5)*sqrt(2) - 2/3]] + [[p == 1, q == 8, x == -4/3*sqrt(10) - 2/3, y == 1/6*sqrt(10) - 2/3], [p == 1, q == 8, x == 4/3*sqrt(10) - 2/3, y == -1/6*sqrt(10) - 2/3]] For numerical approximations of the solutions, you can instead use: @@ -219,7 +218,7 @@ the notation :math:`x=x_{1}`, :math:`y=x_{2}`): sage: de1 = maxima("2*diff(x(t),t, 2) + 6*x(t) - 2*y(t)") sage: lde1 = de1.laplace("t","s"); lde1 - 2*(-%at('diff(x(t),t,1),t=0)+s^2*'laplace(x(t),t,s)-x(0)*s)-2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s) + 2*((-%at('diff(x(t),t,1),t=0))+s^2*'laplace(x(t),t,s)-x(0)*s)-2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s) This is hard to read, but it says that @@ -234,7 +233,7 @@ Laplace transform of the second equation: sage: de2 = maxima("diff(y(t),t, 2) + 2*y(t) - 2*x(t)") sage: lde2 = de2.laplace("t","s"); lde2 - -%at('diff(y(t),t,1),t=0)+s^2*'laplace(y(t),t,s)+2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s)-y(0)*s + (-%at('diff(y(t),t,1),t=0))+s^2*'laplace(y(t),t,s)+2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s)-y(0)*s This says diff --git a/src/doc/en/tutorial/tour_assignment.rst b/src/doc/en/tutorial/tour_assignment.rst index ab9c03a5627..5bbaeb2a820 100644 --- a/src/doc/en/tutorial/tour_assignment.rst +++ b/src/doc/en/tutorial/tour_assignment.rst @@ -95,7 +95,7 @@ hold values of any Python type within a given scope: sage: a = 'hello' # now a is a string sage: type(a) - + <... 'str'> The C programming language, which is statically typed, is much different; a variable declared to hold an int can only hold an int diff --git a/src/doc/en/tutorial/tour_coercion.rst b/src/doc/en/tutorial/tour_coercion.rst index 7508299bbfe..8850341d674 100644 --- a/src/doc/en/tutorial/tour_coercion.rst +++ b/src/doc/en/tutorial/tour_coercion.rst @@ -392,7 +392,7 @@ example: sage: x+y Traceback (most recent call last): ... - TypeError: unsupported operand parent(s) for '+': 'Univariate Polynomial Ring in x over Rational Field' and 'Univariate Polynomial Ring in y over Rational Field' + TypeError: unsupported operand parent(s) for +: 'Univariate Polynomial Ring in x over Rational Field' and 'Univariate Polynomial Ring in y over Rational Field' The reason is that Sage would not choose one of the potential candidates ``QQ['x']['y']``, ``QQ['y']['x']``, ``QQ['x','y']`` or diff --git a/src/doc/en/tutorial/tour_functions.rst b/src/doc/en/tutorial/tour_functions.rst index c803e4096a4..6c006f5180a 100644 --- a/src/doc/en/tutorial/tour_functions.rst +++ b/src/doc/en/tutorial/tour_functions.rst @@ -17,7 +17,7 @@ These functions can be plotted, but not differentiated or integrated. sage: def f(z): return z^2 sage: type(f) - + <... 'function'> sage: f(3) 9 sage: plot(f, 0, 2) diff --git a/src/doc/en/tutorial/tour_help.rst b/src/doc/en/tutorial/tour_help.rst index b59b35faa46..5a9f364dd12 100644 --- a/src/doc/en/tutorial/tour_help.rst +++ b/src/doc/en/tutorial/tour_help.rst @@ -62,7 +62,7 @@ question mark: 0.69314718055994530941723212145817656807 # 64-bit sage: sudoku? File: sage/local/lib/python2.5/site-packages/sage/games/sudoku.py - Type: + Type: <... 'function'> Definition: sudoku(A) Docstring: diff --git a/src/doc/es/tutorial/introduction.rst b/src/doc/es/tutorial/introduction.rst index 942895a15de..01ec7bcdad7 100644 --- a/src/doc/es/tutorial/introduction.rst +++ b/src/doc/es/tutorial/introduction.rst @@ -93,7 +93,7 @@ Sage en tu computador. Aquí hacemos simplemente dos comentarios: en un directorio en el que TeX va a buscar. La documentación para usar SageTeX se encuentra en - ``$SAGE_ROOT/local/share/texmf/tex/generic/sagetex/``, donde + ``$SAGE_ROOT/local/share/texmf/tex/latex/sagetex/``, donde "``$SAGE_ROOT``" se refiere al directorio donde Sage está instalado -- por ejemplo, ``/opt/sage-4.2.1``. diff --git a/src/doc/es/tutorial/tour_algebra.rst b/src/doc/es/tutorial/tour_algebra.rst index 8f255eba1b1..e8c6b8fe5af 100644 --- a/src/doc/es/tutorial/tour_algebra.rst +++ b/src/doc/es/tutorial/tour_algebra.rst @@ -49,7 +49,7 @@ simbólicamente: sage: eq2 = q*y+p*x==-6 sage: eq3 = q*y^2+p*x^2==24 sage: solve([eq1,eq2,eq3,p==1],p,q,x,y) - [[p == 1, q == 8, x == -4/3*sqrt(10) - 2/3, y == 1/6*sqrt(5)*sqrt(2) - 2/3], [p == 1, q == 8, x == 4/3*sqrt(10) - 2/3, y == -1/6*sqrt(5)*sqrt(2) - 2/3]] + [[p == 1, q == 8, x == -4/3*sqrt(10) - 2/3, y == 1/6*sqrt(10) - 2/3], [p == 1, q == 8, x == 4/3*sqrt(10) - 2/3, y == -1/6*sqrt(10) - 2/3]] Si queremos aproximaciones numéricas de las soluciones, podemos usar lo siguiente: @@ -198,7 +198,7 @@ la notación :math:`x=x_{1}`, :math:`y=x_{2}`): sage: de1 = maxima("2*diff(x(t),t, 2) + 6*x(t) - 2*y(t)") sage: lde1 = de1.laplace("t","s"); lde1 - 2*(-%at('diff(x(t),t,1),t=0)+s^2*'laplace(x(t),t,s)-x(0)*s)-2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s) + 2*((-%at('diff(x(t),t,1),t=0))+s^2*'laplace(x(t),t,s)-x(0)*s)-2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s) El resultado puede ser difícil de leer, pero significa que @@ -213,7 +213,7 @@ Toma la transformada de Laplace de la segunda ecuación: sage: de2 = maxima("diff(y(t),t, 2) + 2*y(t) - 2*x(t)") sage: lde2 = de2.laplace("t","s"); lde2 - -%at('diff(y(t),t,1),t=0)+s^2*'laplace(y(t),t,s)+2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s)-y(0)*s + (-%at('diff(y(t),t,1),t=0))+s^2*'laplace(y(t),t,s)+2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s)-y(0)*s Esto dice diff --git a/src/doc/es/tutorial/tour_assignment.rst b/src/doc/es/tutorial/tour_assignment.rst index 3cb301e4892..d5144f74e29 100644 --- a/src/doc/es/tutorial/tour_assignment.rst +++ b/src/doc/es/tutorial/tour_assignment.rst @@ -94,7 +94,7 @@ contener valores de cualquier tipo Python dentro de un ámbito dado: sage: a = 'hello' # ahora es una cadena sage: type(a) - + <... 'str'> El lenguaje de programación C, que es un lenguaje de tipado estático, es muy diferente; una variable declarada como int solo puede contener un int diff --git a/src/doc/es/tutorial/tour_help.rst b/src/doc/es/tutorial/tour_help.rst index 7d9986e8c38..fde1d7656d3 100644 --- a/src/doc/es/tutorial/tour_help.rst +++ b/src/doc/es/tutorial/tour_help.rst @@ -62,7 +62,7 @@ de interrogación: 0.69314718055994530941723212145817656807 # 64-bit sage: sudoku? File: sage/local/lib/python2.5/site-packages/sage/games/sudoku.py - Type: + Type: <... 'function'> Definition: sudoku(A) Docstring: diff --git a/src/doc/fr/tutorial/interfaces.rst b/src/doc/fr/tutorial/interfaces.rst index da867c540f3..75f36a46f9b 100644 --- a/src/doc/fr/tutorial/interfaces.rst +++ b/src/doc/fr/tutorial/interfaces.rst @@ -64,7 +64,7 @@ commandes sont de types différents : sage: type(gp('znprimroot(10007)')) sage: type(pari('znprimroot(10007)')) - + Alors, laquelle des intrefaces utiliser ? Tout dépend de ce que vous cherchez à faire. L'interface GP permet de faire absolument tout ce que @@ -102,9 +102,9 @@ Commençons par créer une liste PARI à partir d'une liste Python. sage: v [1, 2, 3, 4, 5] sage: type(v) - + -En Sage, les objets PARI sont de type ``py_pari.gen``. Le type PARI de +En Sage, les objets PARI sont de type ``Gen``. Le type PARI de l'objet sous-jacent est donné par la méthode ``type``. :: @@ -115,7 +115,7 @@ l'objet sous-jacent est donné par la méthode ``type``. Pour créer une courbe elliptique en PARI, on utiliserait ``ellinit([1,2,3,4,5])``. La syntaxe Sage est semblable, à ceci près que ``ellinit`` devient une méthode qui peut être appelée sur n'importe quel -objet PARI, par exemle notre ``t_VEC v``. +objet PARI, par exemle notre ``t_VEC`` `v`. :: diff --git a/src/doc/fr/tutorial/introduction.rst b/src/doc/fr/tutorial/introduction.rst index f82a79edd0b..68a48862727 100644 --- a/src/doc/fr/tutorial/introduction.rst +++ b/src/doc/fr/tutorial/introduction.rst @@ -99,7 +99,7 @@ Nous nous limiterons ici à quelques remarques. d'environnement. La documentation de SageTeX se trouve dans le répertoire - ``$SAGE_ROOT/local/share/texmf/tex/generic/sagetex/``, où + ``$SAGE_ROOT/local/share/texmf/tex/latex/sagetex/``, où "``$SAGE_ROOT``" est le répertoire où vous avez installé Sage, par exemple ``/opt/sage-4.3.4``. diff --git a/src/doc/fr/tutorial/programming.rst b/src/doc/fr/tutorial/programming.rst index 11d7da60cc9..1b752e4d946 100644 --- a/src/doc/fr/tutorial/programming.rst +++ b/src/doc/fr/tutorial/programming.rst @@ -208,17 +208,17 @@ listes, les n-uplets, les entiers et les flottants : :: sage: s = "sage"; type(s) - + <... 'str'> sage: s = 'sage'; type(s) # guillemets simples ou doubles - + <... 'str'> sage: s = [1,2,3,4]; type(s) - + <... 'list'> sage: s = (1,2,3,4); type(s) - + <... 'tuple'> sage: s = int(2006); type(s) - + <... 'int'> sage: s = float(2006); type(s) - + <... 'float'> Sage ajoute de nombreux autres types. Par exemple, les espaces vectoriels : @@ -301,7 +301,7 @@ sont indexés à partir de :math:`0` : sage: v = [2, 3, 5, 'x', SymmetricGroup(3)]; v [2, 3, 5, 'x', Symmetric group of order 3! as a permutation group] sage: type(v) - + <... 'list'> sage: v[0] 2 sage: v[2] @@ -371,7 +371,7 @@ une fois créés. sage: v = (1,2,3,4); v (1, 2, 3, 4) sage: type(v) - + <... 'tuple'> sage: v[1] = 5 Traceback (most recent call last): ... @@ -415,7 +415,7 @@ utilisées partout où les listes peuvent l'être : sage: list(v) [1, 2, 3, 4/5] sage: type(list(v)) - + <... 'list'> Autre exemple : les bases d'espaces vectoriels sont des séquences non mutables, car il ne faut pas les modifier. @@ -451,7 +451,7 @@ Python pour plus de détails) vers des objets arbitraires. sage: d = {1:5, 'sage':17, ZZ:GF(7)} sage: type(d) - + <... 'dict'> sage: d.keys() [1, 'sage', Integer Ring] sage: d['sage'] @@ -472,7 +472,7 @@ contenant les mêmes données : :: - sage: d.items() + sage: list(d.items()) [(1, 5), ('sage', 17), (Integer Ring, Finite Field of size 7)] Le parcours itératifs des paires d'un dictionnaire est un idiome de @@ -481,7 +481,7 @@ programmation fréquent : :: sage: d = {2:4, 3:9, 4:16} - sage: [a*b for a, b in d.iteritems()] + sage: [a*b for a, b in d.items()] [8, 27, 64] Comme le montre la dernière sortie ci-dessus, un dictionnaire stocke ses @@ -671,16 +671,6 @@ deux membres en des nombres du même type lorsque c'est possible : True True -Deux objets quelconques ou presque peuvent être comparés, sans hypothèse -sur l'existence d'un ordre total sous-jacent. - -:: - - sage: 2 < CC(3.1,1) - True - sage: 5 < VectorSpace(QQ,3) # random - True - Pour évaluer des inégalités symboliques, utilisez ``bool`` : :: diff --git a/src/doc/fr/tutorial/sagetex.rst b/src/doc/fr/tutorial/sagetex.rst index 889594d9654..9aa52f3759a 100644 --- a/src/doc/fr/tutorial/sagetex.rst +++ b/src/doc/fr/tutorial/sagetex.rst @@ -16,7 +16,7 @@ locale) pour plus de détails. Voici un bref exemple d'utilisation de SageTeX. La documentation complète se trouve dans -``SAGE_ROOT/local/share/texmf/tex/generic/sagetex``, où ``SAGE_ROOT`` +``SAGE_ROOT/local/share/texmf/tex/latex/sagetex``, où ``SAGE_ROOT`` désigne le répertoire racine de votre installation Sage. Elle est accompagnée d'un fichier exemple et de scripts Python potentiellement utiles. @@ -114,4 +114,4 @@ compilation précédente.) SageTeX offre bien d'autres possibilités. Puisque Sage comme LaTeX sont des outils complexes et puissants, le mieux est sans doute de consulter la documentation complète de SageTeX, qui se trouve -dans ``SAGE_ROOT/local/share/texmf/tex/generic/sagetex``. +dans ``SAGE_ROOT/local/share/texmf/tex/latex/sagetex``. diff --git a/src/doc/fr/tutorial/tour_algebra.rst b/src/doc/fr/tutorial/tour_algebra.rst index e944975ed89..ca63cfec968 100644 --- a/src/doc/fr/tutorial/tour_algebra.rst +++ b/src/doc/fr/tutorial/tour_algebra.rst @@ -50,7 +50,7 @@ résout le système de façon symbolique : sage: eq2 = q*y+p*x==-6 sage: eq3 = q*y^2+p*x^2==24 sage: solve([eq1,eq2,eq3,p==1],p,q,x,y) - [[p == 1, q == 8, x == -4/3*sqrt(10) - 2/3, y == 1/6*sqrt(5)*sqrt(2) - 2/3], [p == 1, q == 8, x == 4/3*sqrt(10) - 2/3, y == -1/6*sqrt(5)*sqrt(2) - 2/3]] + [[p == 1, q == 8, x == -4/3*sqrt(10) - 2/3, y == 1/6*sqrt(10) - 2/3], [p == 1, q == 8, x == 4/3*sqrt(10) - 2/3, y == -1/6*sqrt(10) - 2/3]] Pour une résolution numérique, on peut utiliser à la place : @@ -183,7 +183,7 @@ Solution : Considérons la transformée de Laplace de la première équation sage: de1 = maxima("2*diff(x(t),t, 2) + 6*x(t) - 2*y(t)") sage: lde1 = de1.laplace("t","s"); lde1 - 2*(-%at('diff(x(t),t,1),t=0)+s^2*'laplace(x(t),t,s)-x(0)*s)-2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s) + 2*((-%at('diff(x(t),t,1),t=0))+s^2*'laplace(x(t),t,s)-x(0)*s)-2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s) La réponse n'est pas très lisible, mais elle signifie que @@ -198,7 +198,7 @@ la seconde équation : sage: de2 = maxima("diff(y(t),t, 2) + 2*y(t) - 2*x(t)") sage: lde2 = de2.laplace("t","s"); lde2 - -%at('diff(y(t),t,1),t=0)+s^2*'laplace(y(t),t,s)+2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s)-y(0)*s + (-%at('diff(y(t),t,1),t=0))+s^2*'laplace(y(t),t,s)+2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s)-y(0)*s Ceci signifie diff --git a/src/doc/fr/tutorial/tour_assignment.rst b/src/doc/fr/tutorial/tour_assignment.rst index 4594e7d0b8d..70e0767586a 100644 --- a/src/doc/fr/tutorial/tour_assignment.rst +++ b/src/doc/fr/tutorial/tour_assignment.rst @@ -99,7 +99,7 @@ sein d'une même portée : sage: a = 'hello' # ...et maintenant une chaîne sage: type(a) - + <... 'str'> Le langage de programmation C, qui est statiquement typé, est bien différent : une fois déclarée de type int, une variable ne peut contenir diff --git a/src/doc/fr/tutorial/tour_coercion.rst b/src/doc/fr/tutorial/tour_coercion.rst index 009619ec18a..1be851e1976 100644 --- a/src/doc/fr/tutorial/tour_coercion.rst +++ b/src/doc/fr/tutorial/tour_coercion.rst @@ -389,7 +389,7 @@ Dans l'exemple suivant, il n'y a pas de coercition vers un parent commun : sage: x+y Traceback (most recent call last): ... - TypeError: unsupported operand parent(s) for '+': 'Univariate Polynomial Ring in x over Rational Field' and 'Univariate Polynomial Ring in y over Rational Field' + TypeError: unsupported operand parent(s) for +: 'Univariate Polynomial Ring in x over Rational Field' and 'Univariate Polynomial Ring in y over Rational Field' En effet, Sage refuse de choisir entre les candidats ``QQ['x']['y']``, ``QQ['y']['x']``, ``QQ['x','y']`` et ``QQ['y','x']``, car ces quatre structures diff --git a/src/doc/fr/tutorial/tour_functions.rst b/src/doc/fr/tutorial/tour_functions.rst index 4d98e43df34..d00b725c2cc 100644 --- a/src/doc/fr/tutorial/tour_functions.rst +++ b/src/doc/fr/tutorial/tour_functions.rst @@ -16,7 +16,7 @@ pour tracer des courbes, mais pas dérivées ou intégrées symboliquement:: sage: def f(z): return z^2 sage: type(f) - + <... 'function'> sage: f(3) 9 sage: plot(f, 0, 2) diff --git a/src/doc/fr/tutorial/tour_help.rst b/src/doc/fr/tutorial/tour_help.rst index 0390499d238..68e6078006d 100644 --- a/src/doc/fr/tutorial/tour_help.rst +++ b/src/doc/fr/tutorial/tour_help.rst @@ -62,7 +62,7 @@ point d'interrogation : 0.69314718055994530941723212145817656807 # 64-bit sage: sudoku? File: sage/local/lib/python2.5/site-packages/sage/games/sudoku.py - Type: + Type: <... 'function'> Definition: sudoku(A) Docstring: diff --git a/src/doc/ja/tutorial/interfaces.rst b/src/doc/ja/tutorial/interfaces.rst index 896f1064fb8..560032a7b8f 100644 --- a/src/doc/ja/tutorial/interfaces.rst +++ b/src/doc/ja/tutorial/interfaces.rst @@ -55,7 +55,7 @@ GPは送られて来た文字列を評価し，結果を変数に格納する( sage: type(gp('znprimroot(10007)')) sage: type(pari('znprimroot(10007)')) - + では，どちらの方法を選ぶべきだろうか？ 答は目的による、としか言えない． @@ -84,10 +84,10 @@ PARI Cライブラリ インターフェイスについて言うと，こちら sage: v [1, 2, 3, 4, 5] sage: type(v) - + -PARIのオブジェクトは全て ``py_pari.gen`` 型になる． +PARIのオブジェクトは全て ``Gen`` 型になる． 各オブジェクトに埋め込まれているPARI由来のデータ型を取得するには，メンバ関数 ``type`` を使う． :: @@ -96,7 +96,7 @@ PARIのオブジェクトは全て ``py_pari.gen`` 型になる． 't_VEC' PARIで楕円曲線を生成するには， ``ellinit([1,2,3,4,5])`` と入力する． -Sageの方法も似ているが， ``ellinit`` を先の ``t\_VEC v`` のような任意のPARIオブジェクトに対して呼び出すことができる点が違っている． +Sageの方法も似ているが， ``ellinit`` を先の ``t_VEC`` `v` のような任意のPARIオブジェクトに対して呼び出すことができる点が違っている． :: sage: e = v.ellinit() diff --git a/src/doc/ja/tutorial/introduction.rst b/src/doc/ja/tutorial/introduction.rst index ef90446a4f6..ba092ddd6a3 100644 --- a/src/doc/ja/tutorial/introduction.rst +++ b/src/doc/ja/tutorial/introduction.rst @@ -73,7 +73,7 @@ Sageを自分のコンピュータへインストールする手順について SageTeXの利用に関する解説は -``$SAGE_ROOT/local/share/texmf/tex/generic/sagetex/`` にある． +``$SAGE_ROOT/local/share/texmf/tex/latex/sagetex/`` にある． ``$SAGE_ROOT`` はSageがインストールされているディレクトリで，例えば ``/opt/sage-4.2.1`` などとなっているはずだ． diff --git a/src/doc/ja/tutorial/programming.rst b/src/doc/ja/tutorial/programming.rst index b35235fc1b1..1fad0f6131e 100644 --- a/src/doc/ja/tutorial/programming.rst +++ b/src/doc/ja/tutorial/programming.rst @@ -177,17 +177,17 @@ Pythonの組み込み型としては，string(文字列)，list(リスト)，タ :: sage: s = "sage"; type(s) - + <... 'str'> sage: s = 'sage'; type(s) # シングルあるいはダブル クォーテーションのどちらも使える - + <... 'str'> sage: s = [1,2,3,4]; type(s) - + <... 'list'> sage: s = (1,2,3,4); type(s) - + <... 'tuple'> sage: s = int(2006); type(s) - + <... 'int'> sage: s = float(2006); type(s) - + <... 'float'> Sageでは，さらに多様な型が加わる． その一例がベクトル空間である: @@ -262,7 +262,7 @@ Sageでは，さらに多様な型が加わる． sage: v = [2, 3, 5, 'x', SymmetricGroup(3)]; v [2, 3, 5, 'x', Symmetric group of order 3! as a permutation group] sage: type(v) - + <... 'list'> sage: v[0] 2 sage: v[2] @@ -340,7 +340,7 @@ SageのIntegerクラスが使えるのは言うまでもない(Rationalクラス sage: v = (1,2,3,4); v (1, 2, 3, 4) sage: type(v) - + <... 'tuple'> sage: v[1] = 5 Traceback (most recent call last): ... @@ -382,7 +382,7 @@ Sageで使われる第三のリスト類似データ型が，シーケンスで sage: list(v) [1, 2, 3, 4/5] sage: type(list(v)) - + <... 'list'> 不変性シーケンスの例としては，ベクトル空間の基底系があげられる． @@ -417,7 +417,7 @@ Sageで使われる第三のリスト類似データ型が，シーケンスで sage: d = {1:5, 'sage':17, ZZ:GF(7)} sage: type(d) - + <... 'dict'> sage: d.keys() [1, 'sage', Integer Ring] sage: d['sage'] @@ -437,7 +437,7 @@ Sageで使われる第三のリスト類似データ型が，シーケンスで :: - sage: d.items() + sage: list(d.items()) [(1, 5), ('sage', 17), (Integer Ring, Finite Field of size 7)] ディクショナリに含まれるキーと値の対を反復に利用する場合に，よく使われるイディオムがある: @@ -446,7 +446,7 @@ Sageで使われる第三のリスト類似データ型が，シーケンスで :: sage: d = {2:4, 3:9, 4:16} - sage: [a*b for a, b in d.iteritems()] + sage: [a*b for a, b in d.items()] [8, 27, 64] 最後の出力を見ると判るように，ディクショナリ内は整列されていない． @@ -630,17 +630,6 @@ Sageに付属している関数 ``kronecker`` は，PARIのCライブラリを True True -比較演算は，ほとんどいかなる組合せの二つのオブジェクトに対しても行ないうると考えてよい． -対象となるオブジェクトは，全順序付け(total ordering)されなくても構わない． - - -:: - - sage: 2 < CC(3.1,1) - True - sage: 5 < VectorSpace(QQ,3) # random 出力は一定しない。 - False - 記号を含む不等号の判定には ``bool`` 関数を用いる: :: diff --git a/src/doc/ja/tutorial/sagetex.rst b/src/doc/ja/tutorial/sagetex.rst index 139358ba36a..350bc32d9bf 100644 --- a/src/doc/ja/tutorial/sagetex.rst +++ b/src/doc/ja/tutorial/sagetex.rst @@ -13,7 +13,7 @@ SageTeXパッケージを使うと，Sageによる処理結果をLaTeX文書に ここでは，ごく簡単な例題を通してSageTeXの利用手順を紹介する． 完全な解説ドキュメントと例題ファイルは，ディレクトリ ``SAGE_ROOT/local/share/doc/sagetex`` に置いてある． -``SAGE_ROOT/local/share/texmf/tex/generic/sagetex`` にあるPythonスクリプトは何か役に立つ場面があるはずだ． +``SAGE_ROOT/local/share/texmf/tex/latex/sagetex`` にあるPythonスクリプトは何か役に立つ場面があるはずだ． 以上の ``SAGE_ROOT`` は，Sageをインストールしたディレクトリである． @@ -118,7 +118,7 @@ SageTeXはデフォルトでSageにインストールされるが，LaTeX文書 鍵になるのは， TeXが ``sagetex.sty`` を発見できるかどうかである． この ``sagetex.sty`` は， ``SAGE_ROOT`` をSageがビルトあるいはインストールされたディレクトリとすると， -``SAGE_ROOT/local/share/texmf/tex/generic/sagetex/`` に置かれているはずだ． +``SAGE_ROOT/local/share/texmf/tex/latex/sagetex/`` に置かれているはずだ． TeXが ``sagetex.sty`` を読めるようにしてやらなければ，SageTeXも動作できないのである． これを実現するには何通りかのやり方がある． diff --git a/src/doc/ja/tutorial/tour_algebra.rst b/src/doc/ja/tutorial/tour_algebra.rst index a82d16f31fa..39330d91504 100644 --- a/src/doc/ja/tutorial/tour_algebra.rst +++ b/src/doc/ja/tutorial/tour_algebra.rst @@ -55,9 +55,7 @@ Sageでは，初等的な代数と微積分に関連した多様な演算を実 sage: eq2 = q*y+p*x==-6 sage: eq3 = q*y^2+p*x^2==24 sage: solve([eq1,eq2,eq3,p==1],p,q,x,y) - [[p == 1, q == 8, x == -4/3*sqrt(10) - 2/3, y == 1/6*sqrt(5)*sqrt(2) - 2/3], - [p == 1, q == 8, x == 4/3*sqrt(10) - 2/3, y == -1/6*sqrt(5)*sqrt(2) - 2/3]] - + [[p == 1, q == 8, x == -4/3*sqrt(10) - 2/3, y == 1/6*sqrt(10) - 2/3], [p == 1, q == 8, x == 4/3*sqrt(10) - 2/3, y == -1/6*sqrt(10) - 2/3]] 解の数値近似を求めるには，やり方を変えて: @@ -216,8 +214,7 @@ Sageを使って常微分方程式を研究することもできる． :math:`x' sage: de1 = maxima("2*diff(x(t),t, 2) + 6*x(t) - 2*y(t)") sage: lde1 = de1.laplace("t","s"); lde1 - 2*(-%at('diff(x(t),t,1),t=0)+s^2*'laplace(x(t),t,s)-x(0)*s)-2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s) - + 2*((-%at('diff(x(t),t,1),t=0))+s^2*'laplace(x(t),t,s)-x(0)*s)-2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s) この出力は読みにくいけれども，意味しているのは @@ -231,7 +228,7 @@ Sageを使って常微分方程式を研究することもできる． :math:`x' sage: de2 = maxima("diff(y(t),t, 2) + 2*y(t) - 2*x(t)") sage: lde2 = de2.laplace("t","s"); lde2 - -%at('diff(y(t),t,1),t=0)+s^2*'laplace(y(t),t,s)+2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s)-y(0)*s + (-%at('diff(y(t),t,1),t=0))+s^2*'laplace(y(t),t,s)+2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s)-y(0)*s 意味するところは diff --git a/src/doc/ja/tutorial/tour_assignment.rst b/src/doc/ja/tutorial/tour_assignment.rst index 4c1978daf48..be04ba7f6f1 100644 --- a/src/doc/ja/tutorial/tour_assignment.rst +++ b/src/doc/ja/tutorial/tour_assignment.rst @@ -85,7 +85,7 @@ Pythonのデータはダイナミックに型付けされ，変数を通して sage: a = 'hello' # ここでaは文字列 sage: type(a) - + <... 'str'> プログラミング言語Cでは変数がスタティックに型付けされるから振舞いはかなり異なっていて，整数(int)型として宣言された変数は同じスコープ内では整数しか保持できない． diff --git a/src/doc/ja/tutorial/tour_coercion.rst b/src/doc/ja/tutorial/tour_coercion.rst index e6ab605c2d2..f7194d4bd45 100644 --- a/src/doc/ja/tutorial/tour_coercion.rst +++ b/src/doc/ja/tutorial/tour_coercion.rst @@ -355,7 +355,7 @@ Sageが宗とするのは歩み寄りだ． sage: x+y Traceback (most recent call last): ... - TypeError: unsupported operand parent(s) for '+': 'Univariate Polynomial Ring in x over Rational Field' and 'Univariate Polynomial Ring in y over Rational Field' + TypeError: unsupported operand parent(s) for +: 'Univariate Polynomial Ring in x over Rational Field' and 'Univariate Polynomial Ring in y over Rational Field' だめな理由は，Sageが有望そうな候補 ``QQ['x']['y']`` ， ``QQ['y']['x']`` ， ``QQ['x','y']`` あるいは ``QQ['y','x']`` のどれも選択できないことである． と言うのも，これら4つの相異なる構造はどれも共通なペアレントとして相応しく，基準となるべき選択肢にならないからだ． diff --git a/src/doc/ja/tutorial/tour_functions.rst b/src/doc/ja/tutorial/tour_functions.rst index e2334cae25b..159ffca4c51 100644 --- a/src/doc/ja/tutorial/tour_functions.rst +++ b/src/doc/ja/tutorial/tour_functions.rst @@ -15,7 +15,7 @@ Sageで「関数」と呼ばれるべきものを定義する方法は何通り sage: def f(z): return z^2 sage: type(f) - + <... 'function'> sage: f(3) 9 sage: plot(f, 0, 2) diff --git a/src/doc/ja/tutorial/tour_help.rst b/src/doc/ja/tutorial/tour_help.rst index 7f26226b017..5e3d095cfec 100644 --- a/src/doc/ja/tutorial/tour_help.rst +++ b/src/doc/ja/tutorial/tour_help.rst @@ -60,7 +60,7 @@ Sageには充実したドキュメントが組込まれていて，(例えば) 0.69314718055994530941723212145817656807 # 同じく64ビット sage: sudoku? File: sage/local/lib/python2.5/site-packages/sage/games/sudoku.py - Type: + Type: <... 'function'> Definition: sudoku(A) Docstring: diff --git a/src/doc/pt/tutorial/interfaces.rst b/src/doc/pt/tutorial/interfaces.rst index 115855a459e..5f611f837fc 100644 --- a/src/doc/pt/tutorial/interfaces.rst +++ b/src/doc/pt/tutorial/interfaces.rst @@ -63,7 +63,7 @@ diferentes: sage: type(gp('znprimroot(10007)')) sage: type(pari('znprimroot(10007)')) - + Então qual eu devo usar? Depende do que você está fazendo. A interface GP pode fazer absolutamente tudo o que você poderia fazer na linha de @@ -101,9 +101,9 @@ Primeiro criamos uma lista do PARI a partir de uma lista do Python. sage: v [1, 2, 3, 4, 5] sage: type(v) - + -Cada objeto do PARI é do tipo ``py_pari_gem``. O tipo PARI do objeto +Cada objeto do PARI é do tipo ``Gen``. O tipo PARI do objeto subjacente pode ser obtido usando a função ``type``. :: @@ -112,9 +112,9 @@ subjacente pode ser obtido usando a função ``type``. 't_VEC' Em PARI, para criar uma curva elíptica digitamos -``ellinit([1,2,3,4,5])``. Em Sage é similar, exceto que ``ellnint`` é +``ellinit([1,2,3,4,5])``. Em Sage é similar, exceto que ``ellinit`` é um método que pode ser chamado em qualquer objeto do PARI, por -exemplo, ``t\_VEC v``. +exemplo, ``t_VEC`` `v`. :: diff --git a/src/doc/pt/tutorial/introduction.rst b/src/doc/pt/tutorial/introduction.rst index d44e960a8e3..127e1b71f9a 100644 --- a/src/doc/pt/tutorial/introduction.rst +++ b/src/doc/pt/tutorial/introduction.rst @@ -93,7 +93,7 @@ computador. Aqui faremos apenas alguns comentários. encontrá-lo. A documentação para usar o SageTex está disponível em - ``$SAGE_ROOT/local/share/texmf/tex/generic/sagetex/``, onde + ``$SAGE_ROOT/local/share/texmf/tex/latex/sagetex/``, onde ``$SAGE_ROOT`` refere-se ao diretório onde você instalou o Sage -- por exemplo, ``/opt/sage-4.2.1``. diff --git a/src/doc/pt/tutorial/programming.rst b/src/doc/pt/tutorial/programming.rst index 47f2aecaf43..90f473901b5 100644 --- a/src/doc/pt/tutorial/programming.rst +++ b/src/doc/pt/tutorial/programming.rst @@ -226,17 +226,17 @@ e floats, como ilustrado: :: sage: s = "sage"; type(s) - + <... 'str'> sage: s = 'sage'; type(s) # you can use either single or double quotes - + <... 'str'> sage: s = [1,2,3,4]; type(s) - + <... 'list'> sage: s = (1,2,3,4); type(s) - + <... 'tuple'> sage: s = int(2006); type(s) - + <... 'int'> sage: s = float(2006); type(s) - + <... 'float'> Além disso, o Sage acrescenta vários outros tipos. Por exemplo, espaços vetoriais: @@ -317,7 +317,7 @@ computacional), os elementos da lista são indexados a partir do sage: v = [2, 3, 5, 'x', SymmetricGroup(3)]; v [2, 3, 5, 'x', Symmetric group of order 3! as a permutation group] sage: type(v) - + <... 'list'> sage: v[0] 2 sage: v[2] @@ -388,7 +388,7 @@ vez criadas elas não podem ser alteradas. sage: v = (1,2,3,4); v (1, 2, 3, 4) sage: type(v) - + <... 'tuple'> sage: v[1] = 5 Traceback (most recent call last): ... @@ -431,7 +431,7 @@ lugar que listas são usadas. sage: list(v) [1, 2, 3, 4/5] sage: type(list(v)) - + <... 'list'> Como um outro exemplo, bases para espaços vetoriais são sequências imutáveis, pois é importante que elas não sejam modificadas. @@ -466,7 +466,7 @@ para detalhes). sage: d = {1:5, 'sage':17, ZZ:GF(7)} sage: type(d) - + <... 'dict'> sage: d.keys() [1, 'sage', Integer Ring] sage: d['sage'] @@ -486,7 +486,7 @@ dados: :: - sage: d.items() + sage: list(d.items()) [(1, 5), ('sage', 17), (Integer Ring, Finite Field of size 7)] É comum iterar sobre os pares em um dicionário: @@ -494,7 +494,7 @@ dados: :: sage: d = {2:4, 3:9, 4:16} - sage: [a*b for a, b in d.iteritems()] + sage: [a*b for a, b in d.items()] [8, 27, 64] Um dicionário não possui ordem, como o exemplo acima mostra. @@ -673,16 +673,6 @@ converter ambos os números para o mesmo tipo, se possível: True True -Quase todos pares de objetos podem ser comparados; não se supõe que os -objetos estejam equipados com uma ordem total. - -:: - - sage: 2 < CC(3.1,1) - True - sage: 5 < VectorSpace(QQ,3) # output can be somewhat random - True - Use bool para desigualdades simbólicas: :: diff --git a/src/doc/pt/tutorial/sagetex.rst b/src/doc/pt/tutorial/sagetex.rst index 4aae0859754..949b9b3e6db 100644 --- a/src/doc/pt/tutorial/sagetex.rst +++ b/src/doc/pt/tutorial/sagetex.rst @@ -14,7 +14,7 @@ instalação do Sage `_ Aqui vai um breve exemplo de como usar o SageTeX. A documentação completa pode ser encontrada em -``SAGE_ROOT/local/share/texmf/tex/generic/sagetex``, onde +``SAGE_ROOT/local/share/texmf/tex/latex/sagetex``, onde ``SAGE_ROOT`` é o diretório onde se encontra a sua instalação. Esse diretório contém a documentação, um arquivo de exemplo, e alguns scripts em Python possivelmente úteis. @@ -107,4 +107,4 @@ os comandos em Sage em seu documento. Há muito mais sobre o SageTeX, e como tanto o Sage como o LaTeX são ferramentas complexas e poderosas, é uma boa idéia ler a documentação para o SageTeX que se encontra em -``SAGE_ROOT/local/share/texmf/tex/generic/sagetex``. +``SAGE_ROOT/local/share/texmf/tex/latex/sagetex``. diff --git a/src/doc/pt/tutorial/tour_algebra.rst b/src/doc/pt/tutorial/tour_algebra.rst index f456b0f70e6..fb715fdaf0d 100644 --- a/src/doc/pt/tutorial/tour_algebra.rst +++ b/src/doc/pt/tutorial/tour_algebra.rst @@ -52,8 +52,7 @@ primeiro, resolvemos o sistemas simbolicamente: sage: eq2 = q*y+p*x==-6 sage: eq3 = q*y^2+p*x^2==24 sage: solve([eq1,eq2,eq3,p==1],p,q,x,y) - [[p == 1, q == 8, x == -4/3*sqrt(10) - 2/3, y == 1/6*sqrt(5)*sqrt(2) - 2/3], - [p == 1, q == 8, x == 4/3*sqrt(10) - 2/3, y == -1/6*sqrt(5)*sqrt(2) - 2/3]] + [[p == 1, q == 8, x == -4/3*sqrt(10) - 2/3, y == 1/6*sqrt(10) - 2/3], [p == 1, q == 8, x == 4/3*sqrt(10) - 2/3, y == -1/6*sqrt(10) - 2/3]] Para obter soluções numéricas aproximadas, podemos usar: @@ -207,7 +206,7 @@ equação (usando a notação :math:`x=x_{1}`, :math:`y=x_{2}`): sage: de1 = maxima("2*diff(x(t),t, 2) + 6*x(t) - 2*y(t)") sage: lde1 = de1.laplace("t","s"); lde1 - 2*(-%at('diff(x(t),t,1),t=0)+s^2*'laplace(x(t),t,s)-x(0)*s)-2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s) + 2*((-%at('diff(x(t),t,1),t=0))+s^2*'laplace(x(t),t,s)-x(0)*s)-2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s) O resultado é um pouco difícil de ler, mas diz que @@ -222,7 +221,7 @@ calcule a transformada de Laplace da segunda equação: sage: de2 = maxima("diff(y(t),t, 2) + 2*y(t) - 2*x(t)") sage: lde2 = de2.laplace("t","s"); lde2 - -%at('diff(y(t),t,1),t=0)+s^2*'laplace(y(t),t,s)+2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s)-y(0)*s + (-%at('diff(y(t),t,1),t=0))+s^2*'laplace(y(t),t,s)+2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s)-y(0)*s O resultado significa que diff --git a/src/doc/pt/tutorial/tour_assignment.rst b/src/doc/pt/tutorial/tour_assignment.rst index 6739d9d5576..5ba8651dc07 100644 --- a/src/doc/pt/tutorial/tour_assignment.rst +++ b/src/doc/pt/tutorial/tour_assignment.rst @@ -95,7 +95,7 @@ variável pode possuir valores de qualquer tipo em determinado escopo: sage: a = 'hello' # now a is a string sage: type(a) - + <... 'str'> A linguagem de programação C, que é de tipagem estática , é muito diferente; uma variável que foi declarada como int pode apenas diff --git a/src/doc/pt/tutorial/tour_coercion.rst b/src/doc/pt/tutorial/tour_coercion.rst index 5c3a4dbe8f0..60589243901 100644 --- a/src/doc/pt/tutorial/tour_coercion.rst +++ b/src/doc/pt/tutorial/tour_coercion.rst @@ -398,7 +398,7 @@ Nenhuma coação para um parente comum vai ocorrer no seguinte exemplo: sage: x+y Traceback (most recent call last): ... - TypeError: unsupported operand parent(s) for '+': 'Univariate Polynomial Ring in x over Rational Field' and 'Univariate Polynomial Ring in y over Rational Field' + TypeError: unsupported operand parent(s) for +: 'Univariate Polynomial Ring in x over Rational Field' and 'Univariate Polynomial Ring in y over Rational Field' A razão é que o Sage não escolhe um dos potenciais candidatos ``QQ['x']['y']``, ``QQ['y']['x']``, ``QQ['x','y']`` ou diff --git a/src/doc/pt/tutorial/tour_functions.rst b/src/doc/pt/tutorial/tour_functions.rst index bf07060e955..dc3ebe3fa9c 100644 --- a/src/doc/pt/tutorial/tour_functions.rst +++ b/src/doc/pt/tutorial/tour_functions.rst @@ -18,7 +18,7 @@ gráficos, mas não podem ser diferenciadas ou integradas. sage: def f(z): return z^2 sage: type(f) - + <... 'function'> sage: f(3) 9 sage: plot(f, 0, 2) diff --git a/src/doc/pt/tutorial/tour_help.rst b/src/doc/pt/tutorial/tour_help.rst index 67778593123..b19c1ffbb1f 100644 --- a/src/doc/pt/tutorial/tour_help.rst +++ b/src/doc/pt/tutorial/tour_help.rst @@ -61,7 +61,7 @@ função ou constante (por exemplo), seguido pelo ponto de interrogação: 0.69314718055994530941723212145817656807 # 64-bit sage: sudoku? File: sage/local/lib/python2.5/site-packages/sage/games/sudoku.py - Type: + Type: <... 'function'> Definition: sudoku(A) Docstring: diff --git a/src/doc/ru/tutorial/interfaces.rst b/src/doc/ru/tutorial/interfaces.rst index 5a9453e97ce..234731a507c 100644 --- a/src/doc/ru/tutorial/interfaces.rst +++ b/src/doc/ru/tutorial/interfaces.rst @@ -59,7 +59,7 @@ GP, и результат записывается в переменную в GP sage: type(gp('znprimroot(10007)')) sage: type(pari('znprimroot(10007)')) - + Так какой же способ использовать? Это зависит от того, что вы делаете. Интерфейс GP может делать все, что может делать программа GP/PARI, запускаемая @@ -92,9 +92,9 @@ Sage использует С-библиотеку PARI, чтобы поддер sage: v [1, 2, 3, 4, 5] sage: type(v) - + -Каждый объект PARI является объектом типа ``py_pari.gen``. Тип PARI может +Каждый объект PARI является объектом типа ``Gen``. Тип PARI может быть получен с помощью функции-члена ``type``. .. link @@ -106,7 +106,7 @@ Sage использует С-библиотеку PARI, чтобы поддер В PARI, чтобы создать эллиптическую кривую, нужно ввести ``ellinit([1,2,3,4,5])``. В Sage способ схож, только ``ellinit`` — это метод, -который может быть вызван для любого объекта PARI, например наша ``t\_VEC v``. +который может быть вызван для любого объекта PARI, например наша ``t_VEC`` `v`. .. link diff --git a/src/doc/ru/tutorial/introduction.rst b/src/doc/ru/tutorial/introduction.rst index 2ea50e06429..820179a9830 100644 --- a/src/doc/ru/tutorial/introduction.rst +++ b/src/doc/ru/tutorial/introduction.rst @@ -84,12 +84,12 @@ Sage в разделе документации: [SA]_ Здесь мы прив результаты вычислений Sage в LaTeX файл, требуется сделать SageTeX известным вашей системе TeX. Для этого изучите секцию "Make SageTeX known to TeX" в `Руководстве по установке Sage `_ - (`данная ссылка <../installation/index.html>`_ ведет к локальному размещению + (`данная ссылка <../../en/installation/index.html>`_ ведет к локальному размещению копии руководства по установке). Это довольно просто; вам понадобится всего лишь скопировать один файл в директорию поиска TeX. Документация по использованию SageTeX находится в - ``$SAGE_ROOT/local/share/texmf/tex/generic/sagetex/``, где + ``$SAGE_ROOT/local/share/texmf/tex/latex/sagetex/``, где "``$SAGE_ROOT``" соответствует директории, где установлен сам Sage, например, ``/opt/sage-4.2.1``. diff --git a/src/doc/ru/tutorial/programming.rst b/src/doc/ru/tutorial/programming.rst index a40e5c62868..a00a3296c03 100644 --- a/src/doc/ru/tutorial/programming.rst +++ b/src/doc/ru/tutorial/programming.rst @@ -193,17 +193,17 @@ C и обработан компилятором C. :: sage: s = "sage"; type(s) - + <... 'str'> sage: s = 'sage'; type(s) # Вы можете использовать двойные или одинарные кавычки - + <... 'str'> sage: s = [1,2,3,4]; type(s) - + <... 'list'> sage: s = (1,2,3,4); type(s) - + <... 'tuple'> sage: s = int(2006); type(s) - + <... 'int'> sage: s = float(2006); type(s) - + <... 'float'> В свою очередь Sage добавляет много других типов данных, например, векторное поле: @@ -280,7 +280,7 @@ C++ и т.д., но в отличие от других алгебраическ sage: v = [2, 3, 5, 'x', SymmetricGroup(3)]; v [2, 3, 5, 'x', Symmetric group of order 3! as a permutation group] sage: type(v) - + <... 'list'> sage: v[0] 2 sage: v[2] @@ -347,7 +347,7 @@ Python, сработает нормально. sage: v = (1,2,3,4); v (1, 2, 3, 4) sage: type(v) - + <... 'tuple'> sage: v[1] = 5 Traceback (most recent call last): ... @@ -390,7 +390,7 @@ Python, сработает нормально. sage: list(v) [1, 2, 3, 4/5] sage: type(list(v)) - + <... 'list'> Базис для векторного поля является неизменяемой последовательностью, так как очень важно не изменять их. Это показано в следующем примере: @@ -424,7 +424,7 @@ http://docs.python.org/lib/typesmapping.html) произвольным объе sage: d = {1:5, 'sage':17, ZZ:GF(7)} sage: type(d) - + <... 'dict'> sage: d.keys() [1, 'sage', Integer Ring] sage: d['sage'] @@ -443,7 +443,7 @@ http://docs.python.org/lib/typesmapping.html) произвольным объе :: - sage: d.items() + sage: list(d.items()) [(1, 5), ('sage', 17), (Integer Ring, Finite Field of size 7)] Часто используемой практикой является произведение итераций по парам в словаре: @@ -451,7 +451,7 @@ http://docs.python.org/lib/typesmapping.html) произвольным объе :: sage: d = {2:4, 3:9, 4:16} - sage: [a*b for a, b in d.iteritems()] + sage: [a*b for a, b in d.items()] [8, 27, 64] Как показывает последний пример, словарь не упорядочен. @@ -632,15 +632,6 @@ http://docs.python.org/lib/typesmapping.html) произвольным объе True True -Практически любые два объекта могут быть сравнены. - -:: - - sage: 2 < CC(3.1,1) - True - sage: 5 < VectorSpace(QQ,3) # random output - True - Используйте переменные bool для символьных неравенств: :: diff --git a/src/doc/ru/tutorial/sagetex.rst b/src/doc/ru/tutorial/sagetex.rst index 9be171c20ec..d23ebc7fb31 100644 --- a/src/doc/ru/tutorial/sagetex.rst +++ b/src/doc/ru/tutorial/sagetex.rst @@ -8,11 +8,11 @@ копирование одного файла). См. :ref:`installation`, а также раздел "Make SageTeX known to TeX" `Руководства по установке Sage `_ (`данная ссылка -<../installation/index.html>`_ ведет к локальному размещению копии руководства +<../../en/installation/index.html>`_ ведет к локальному размещению копии руководства по установке). В этом уроке показан небольшой пример использования SageTeX. Полная документация -находится в ``SAGE_ROOT/local/share/texmf/tex/generic/sagetex``, где +находится в ``SAGE_ROOT/local/share/texmf/tex/latex/sagetex``, где ``SAGE_ROOT`` - это директория, в которой установлен Sage. Эта папка содержит документацию, файл с примером и полезные скрипты Python. @@ -89,4 +89,4 @@ SageTeX known to TeX" `Руководства по установке Sage SageTeX предлагает много возможностей, и так как Sage и LaTeX являются мощными инструментами, то стоит изучить -``SAGE_ROOT/local/share/texmf/tex/generic/sagetex``. +``SAGE_ROOT/local/share/texmf/tex/latex/sagetex``. diff --git a/src/doc/ru/tutorial/tour_algebra.rst b/src/doc/ru/tutorial/tour_algebra.rst index fb2cac89968..495fb6dcddf 100644 --- a/src/doc/ru/tutorial/tour_algebra.rst +++ b/src/doc/ru/tutorial/tour_algebra.rst @@ -49,7 +49,7 @@ Sage может осуществлять вычисления такие, как sage: eq2 = q*y+p*x==-6 sage: eq3 = q*y^2+p*x^2==24 sage: solve([eq1,eq2,eq3,p==1],p,q,x,y) - [[p == 1, q == 8, x == -4/3*sqrt(10) - 2/3, y == 1/6*sqrt(5)*sqrt(2) - 2/3], [p == 1, q == 8, x == 4/3*sqrt(10) - 2/3, y == -1/6*sqrt(5)*sqrt(2) - 2/3]] + [[p == 1, q == 8, x == -4/3*sqrt(10) - 2/3, y == 1/6*sqrt(10) - 2/3], [p == 1, q == 8, x == 4/3*sqrt(10) - 2/3, y == -1/6*sqrt(10) - 2/3]] Для приближенных значений решения можно использовать: @@ -200,7 +200,7 @@ Sage может использоваться для решения диффер sage: de1 = maxima("2*diff(x(t),t, 2) + 6*x(t) - 2*y(t)") sage: lde1 = de1.laplace("t","s"); lde1 - 2*(-%at('diff(x(t),t,1),t=0)+s^2*'laplace(x(t),t,s)-x(0)*s)-2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s) + 2*((-%at('diff(x(t),t,1),t=0))+s^2*'laplace(x(t),t,s)-x(0)*s)-2*'laplace(y(t),t,s)+6*'laplace(x(t),t,s) Данный результат тяжело читаем, однако должен быть понят как @@ -212,7 +212,7 @@ Sage может использоваться для решения диффер sage: de2 = maxima("diff(y(t),t, 2) + 2*y(t) - 2*x(t)") sage: lde2 = de2.laplace("t","s"); lde2 - -%at('diff(y(t),t,1),t=0)+s^2*'laplace(y(t),t,s)+2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s)-y(0)*s + (-%at('diff(y(t),t,1),t=0))+s^2*'laplace(y(t),t,s)+2*'laplace(y(t),t,s)-2*'laplace(x(t),t,s)-y(0)*s Результат: diff --git a/src/doc/ru/tutorial/tour_assignment.rst b/src/doc/ru/tutorial/tour_assignment.rst index 4844718643a..7f8612cac9b 100644 --- a/src/doc/ru/tutorial/tour_assignment.rst +++ b/src/doc/ru/tutorial/tour_assignment.rst @@ -93,7 +93,7 @@ Python имеет динамический контроль типов, так sage: a = 'hello' # теперь a - строка sage: type(a) - + <... 'str'> Язык C, который имеет статический контроль типов, существенно отличается; переменная, объявленная как целое число, может содержать только целое число. diff --git a/src/doc/ru/tutorial/tour_functions.rst b/src/doc/ru/tutorial/tour_functions.rst index 25e53b9192e..6cc4d9c73c2 100644 --- a/src/doc/ru/tutorial/tour_functions.rst +++ b/src/doc/ru/tutorial/tour_functions.rst @@ -18,7 +18,7 @@ sage: def f(z): return z^2 sage: type(f) - + <... 'function'> sage: f(3) 9 sage: plot(f, 0, 2) diff --git a/src/doc/ru/tutorial/tour_help.rst b/src/doc/ru/tutorial/tour_help.rst index 0ceedb78caa..06e447f840d 100644 --- a/src/doc/ru/tutorial/tour_help.rst +++ b/src/doc/ru/tutorial/tour_help.rst @@ -62,7 +62,7 @@ 0.69314718055994530941723212145817656807 # 64-bit sage: sudoku? File: sage/local/lib/python2.5/site-packages/sage/games/sudoku.py - Type: + Type: <... 'function'> Definition: sudoku(A) Docstring: diff --git a/src/ext/doctest/rich_output/example.canvas3d b/src/ext/doctest/rich_output/example.canvas3d index 43b93e9b056..85c7876aebc 100644 --- a/src/ext/doctest/rich_output/example.canvas3d +++ b/src/ext/doctest/rich_output/example.canvas3d @@ -1 +1 @@ -[{vertices:[{x:1,y:1,z:1},{x:-1,y:1,z:1},{x:-1,y:-1,z:1},{x:1,y:-1,z:1}],faces:[[0,1,2,3]],color:'008000'},{vertices:[{x:1,y:1,z:1},{x:-1,y:1,z:1},{x:-1,y:1,z:-1},{x:1,y:1,z:-1}],faces:[[0,1,2,3]],color:'008000'},{vertices:[{x:1,y:1,z:1},{x:1,y:-1,z:1},{x:1,y:-1,z:-1},{x:1,y:1,z:-1}],faces:[[0,1,2,3]],color:'008000'},{vertices:[{x:-1,y:1,z:1},{x:-1,y:-1,z:1},{x:-1,y:-1,z:-1},{x:-1,y:1,z:-1}],faces:[[0,1,2,3]],color:'008000'},{vertices:[{x:1,y:1,z:-1},{x:-1,y:1,z:-1},{x:-1,y:-1,z:-1},{x:1,y:-1,z:-1}],faces:[[0,1,2,3]],color:'008000'},{vertices:[{x:1,y:-1,z:1},{x:-1,y:-1,z:1},{x:-1,y:-1,z:-1},{x:1,y:-1,z:-1}],faces:[[0,1,2,3]],color:'008000'}] \ No newline at end of file +[{"vertices":[{"x":1,"y":1,"z":1},{"x":-1,"y":1,"z":1},{"x":-1,"y":-1,"z":1},{"x":1,"y":-1,"z":1}],"faces":[[0,1,2,3]],"color":"008000"},{"vertices":[{"x":1,"y":1,"z":1},{"x":-1,"y":1,"z":1},{"x":-1,"y":1,"z":-1},{"x":1,"y":1,"z":-1}],"faces":[[0,1,2,3]],"color":"008000"},{"vertices":[{"x":1,"y":1,"z":1},{"x":1,"y":-1,"z":1},{"x":1,"y":-1,"z":-1},{"x":1,"y":1,"z":-1}],"faces":[[0,1,2,3]],"color":"008000"},{"vertices":[{"x":-1,"y":1,"z":1},{"x":-1,"y":-1,"z":1},{"x":-1,"y":-1,"z":-1},{"x":-1,"y":1,"z":-1}],"faces":[[0,1,2,3]],"color":"008000"},{"vertices":[{"x":1,"y":1,"z":-1},{"x":-1,"y":1,"z":-1},{"x":-1,"y":-1,"z":-1},{"x":1,"y":-1,"z":-1}],"faces":[[0,1,2,3]],"color":"008000"},{"vertices":[{"x":1,"y":-1,"z":1},{"x":-1,"y":-1,"z":1},{"x":-1,"y":-1,"z":-1},{"x":1,"y":-1,"z":-1}],"faces":[[0,1,2,3]],"color":"008000"}] \ No newline at end of file diff --git a/src/ext/kenzo/CP2.txt b/src/ext/kenzo/CP2.txt new file mode 100644 index 00000000000..98ec540249d --- /dev/null +++ b/src/ext/kenzo/CP2.txt @@ -0,0 +1,45 @@ +* (show-structure ssz4 6) + +Dimension = 0: + + Vertices : (<>) + +Dimension = 1: + +Dimension = 2: + + Simplex : <<- NIL>>> + + Faces : (>> >> >>) + + Simplex : <<- NIL>>> + + Faces : (>> >> >>) + +Dimension = 3: + + Simplex : <<0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- NIL>>>> >>) + + Simplex : <<- (1)><- NIL>>> + + Faces : (>> <- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- NIL>>>> <- NIL>>>>) + +Dimension = 4: + + Simplex : <<1-0 NIL><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- (1)><- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<1 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<0 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) diff --git a/src/ext/kenzo/CP3.txt b/src/ext/kenzo/CP3.txt new file mode 100644 index 00000000000..458084334a7 --- /dev/null +++ b/src/ext/kenzo/CP3.txt @@ -0,0 +1,349 @@ +* (show-structure ssz6 7) + +Dimension = 0: + + Vertices : (<>) + +Dimension = 1: + +Dimension = 2: + + Simplex : <<- NIL>>> + + Faces : (>> >> >>) + + Simplex : <<- NIL>>> + + Faces : (>> >> >>) + + Simplex : <<- NIL>>> + + Faces : (>> >> >>) + +Dimension = 3: + + Simplex : <<0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- NIL>>>> >>) + + Simplex : <<- (1)><- NIL>>> + + Faces : (>> <- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- NIL>>>> >>) + + Simplex : <<- (2)><- NIL>>> + + Faces : (>> <- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<- (2)><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<- (1)><- NIL>>> + + Faces : (>> <- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- NIL>>>> >>) + +Dimension = 4: + + Simplex : <<1-0 NIL><- (2)><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- (2)><- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<0 (1)><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 NIL><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- (1)><- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<1 (1)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- NIL>>>>) + + Simplex : <<1 (1)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<- (1 1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<1 (2)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (2)><- NIL>>>> <- (2)><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<1 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<1-0 NIL><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <0 NIL><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- NIL>>>>) + + Simplex : <<1 (1)><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<0 (1)><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<- (1 1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<0 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<0 (1)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<1 (1)><- (1)><- NIL>>> + + Faces : (>> <- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>> >>) + + Simplex : <<0 (2)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (2)><- NIL>>>> <- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<- (1 1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<0 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<1 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<1-0 NIL><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- (1)><- NIL>>>> <- NIL>>>> <- NIL>>>>) + +Dimension = 5: + + Simplex : <<0 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <1 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<1 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<1-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 NIL><- (1 1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 NIL><1 (1)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><0 (1)><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + +Dimension = 6: + + Simplex : <<3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) diff --git a/src/ext/kenzo/CP4.txt b/src/ext/kenzo/CP4.txt new file mode 100644 index 00000000000..7a945fe7e20 --- /dev/null +++ b/src/ext/kenzo/CP4.txt @@ -0,0 +1,4774 @@ +* (show-structure ssz8 8) + +Dimension = 0: + + Vertices : (<>) + +Dimension = 1: + +Dimension = 2: + + Simplex : <<- NIL>>> + + Faces : (>> >> >>) + + Simplex : <<- NIL>>> + + Faces : (>> >> >>) + + Simplex : <<- NIL>>> + + Faces : (>> >> >>) + + Simplex : <<- NIL>>> + + Faces : (>> >> >>) + +Dimension = 3: + + Simplex : <<0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- NIL>>>> >>) + + Simplex : <<- (1)><- NIL>>> + + Faces : (>> <- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- NIL>>>> >>) + + Simplex : <<- (2)><- NIL>>> + + Faces : (>> <- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- NIL>>>> >>) + + Simplex : <<- (3)><- NIL>>> + + Faces : (>> <- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<- (2)><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<- (2)><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<- (3)><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<- (2)><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<- (2)><- NIL>>> + + Faces : (>> <- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- NIL>>>> >>) + + Simplex : <<- (1)><- NIL>>> + + Faces : (>> <- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- NIL>>>> >>) + + Simplex : <<- (1)><- NIL>>> + + Faces : (>> <- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- NIL>>>> >>) + + Simplex : <<- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- NIL>>>> <- NIL>>>>) + +Dimension = 4: + + Simplex : <<1-0 NIL><- (3)><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- (3)><- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<0 (1)><- (2)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (2)><- NIL>>>> <- (2)><- NIL>>>>) + + Simplex : <<1-0 NIL><- (2)><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- (2)><- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<1 (1)><- (2)><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- (3)><- NIL>>>> <- (2)><- NIL>>>> <- (2)><- NIL>>>>) + + Simplex : <<1-0 NIL><- (2)><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <- (2)><- NIL>>>> <- (2)><- NIL>>>> <- NIL>>>>) + + Simplex : <<0 (2)><- (1)><- NIL>>> + + Faces : (<- (2)><- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<0 (1)><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 NIL><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- (1)><- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<1 (1)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<- (1 1)><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1 (2)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- (2)><- NIL>>>> <- (3)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<0 (1)><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1 (1)><- (1)><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- NIL>>>>) + + Simplex : <<1 (1)><- (2)><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- (3)><- NIL>>>> <- (2)><- NIL>>>> <- (2)><- NIL>>>>) + + Simplex : <<- (2 1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (3)><- NIL>>>> <- (2)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<1 (2)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- (2)><- NIL>>>> <- (3)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<- (1 2)><0 NIL><- NIL>>> + + Faces : (<- (2)><- NIL>>>> <- (3)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<1 (3)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (3)><- NIL>>>> <- (3)><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<1 (1)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<- (1 1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<1 (2)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (2)><- NIL>>>> <- (2)><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<1 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<1-0 NIL><- (2)><- NIL>>> + + Faces : (<- NIL>>>> <0 NIL><- NIL>>>> <- (2)><- NIL>>>> <- (2)><- NIL>>>> <- NIL>>>>) + + Simplex : <<1 (2)><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <- (2)><- NIL>>>> <- (2)><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<0 (1)><- (2)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (2)><- NIL>>>> <- (2)><- NIL>>>>) + + Simplex : <<1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- NIL>>>>) + + Simplex : <<1 (1)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1 (1)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<- (1 1)><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<- (1 1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<1 (2)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (2)><- NIL>>>> <- (2)><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<- (2 1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (3)><- NIL>>>> <- (2)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<1-0 NIL><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <0 NIL><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- NIL>>>>) + + Simplex : <<1 (1)><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<0 (1)><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<- (1 1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<0 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<0 (1)><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 NIL><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <0 NIL><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- NIL>>>>) + + Simplex : <<1 (1)><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<0 (2)><- (1)><- NIL>>> + + Faces : (<- (2)><- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- NIL>>>>) + + Simplex : <<- (1 1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<1 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<- (1 2)><0 NIL><- NIL>>> + + Faces : (<- (2)><- NIL>>>> <- (3)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<1 (1)><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<0 (1)><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<- (1 1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<0 (1)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<1 (1)><- (1)><- NIL>>> + + Faces : (>> <- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>> >>) + + Simplex : <<0 (2)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (2)><- NIL>>>> <- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<- (1 1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<0 (2)><0 NIL><- NIL>>> + + Faces : (<- (2)><- NIL>>>> <- (2)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<0 (1)><- (2)><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (2)><- NIL>>>> <- (2)><- NIL>>>>) + + Simplex : <<0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<0 (2)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<- (1 1)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- (2)><- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<0 (2)><0 NIL><- NIL>>> + + Faces : (<- (2)><- NIL>>>> <- (2)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<1 (1)><- (2)><- NIL>>> + + Faces : (>> <- (1)><- NIL>>>> <- (3)><- NIL>>>> <- (2)><- NIL>>>> <- (2)><- NIL>>>>) + + Simplex : <<1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>> >>) + + Simplex : <<- (2 1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (3)><- NIL>>>> <- (2)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<1 (2)><- (1)><- NIL>>> + + Faces : (>> <- (2)><- NIL>>>> <- (3)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>> >>) + + Simplex : <<0 (3)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (3)><- NIL>>>> <- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<- (1 2)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (3)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<- (1 1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<0 (2)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (2)><- NIL>>>> <- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>> >>) + + Simplex : <<1 (1)><- (1)><- NIL>>> + + Faces : (>> <- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<0 (1)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<0 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<- (1 1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<1 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<0 (1)><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1 (1)><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<1-0 NIL><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <0 NIL><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- NIL>>>>) + + Simplex : <<1 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<1 (2)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (2)><- NIL>>>> <- (2)><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<- (1 1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<1 (1)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- NIL>>>>) + + Simplex : <<1 (1)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 NIL><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- (1)><- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<0 (1)><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 NIL><- (2)><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- (2)><- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<1-0 NIL><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- NIL>>>> <- (1)><- NIL>>>> <- NIL>>>> <- NIL>>>>) + + Simplex : <<1 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<0 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <- (1)><- NIL>>>> <- NIL>>>> <0 NIL><- NIL>>>> <- NIL>>>>) + +Dimension = 5: + + Simplex : <<0 (1 2)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <- (1 2)><0 NIL><- NIL>>>> <0 (3)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-0 (2)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (2)><- (1)><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (3)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<0 (2 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <- (2 1)><0 NIL><- NIL>>>> <0 (3)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><0 (2)><0 NIL><- NIL>>> + + Faces : (<- (2)><- NIL>>>> <1 (1)><- (2)><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (3)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <- (2)><- NIL>>>>) + + Simplex : <<0 (1 1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 (2)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <0 (2)><- (1)><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><0 (2)><0 NIL><- NIL>>> + + Faces : (<- (2)><- NIL>>>> <0 (1)><- (2)><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <- (2)><- NIL>>>>) + + Simplex : <<0 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<0 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<1-0 (2)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (2)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-1 (1)><0 (2)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <1 (1)><- (2)><- NIL>>>> <- (1)><- NIL>>>> <- (1 2)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>>) + + Simplex : <<- (1 1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <- (2 1)><0 NIL><- NIL>>>> <- (1 2)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2 (1 1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (2)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 2)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<1-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1 (1 1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><- (1 1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (2)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1 2)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><0 (1)><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (2)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<0 (1 1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <0 (2)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<1 (1 2)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (2)><0 NIL><- NIL>>>> <- (1 2)><0 NIL><- NIL>>>> <- (1 2)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-0 (2)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <1 (2)><- (1)><- NIL>>>> <0 (2)><- (1)><- NIL>>>> <- (1 2)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<1-0 (1)><- (1 1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <0 (1)><- (2)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<0 (1 1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (2)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<1-0 (2)><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (2)><0 NIL><- NIL>>>> <0 (2)><- (1)><- NIL>>>> <0 (2)><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 (2)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (2)><- (1)><- NIL>>>> <- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><0 (1)><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<1 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1)><- (1 1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <1 (1)><- (2)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <- (2 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<0 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<- (1 1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <- (2 1)><0 NIL><- NIL>>>> <- (1 2)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<1-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1 (1)><0 (1)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1 (1 1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <1 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-1 (2)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <1 (2)><- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (2 1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<1 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<1 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2 (1 1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <1 (2)><- (1)><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <- (2 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<1-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<0 (1 1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <0 (2)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<1 (1 1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<1 (2 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <- (2 1)><0 NIL><- NIL>>>> <- (2 1)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><1 (2)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <1 (1)><- (2)><- NIL>>>> <0 (1)><- (2)><- NIL>>>> <- (2 1)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>>) + + Simplex : <<1-0 (1)><- (1 1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <0 (1)><- (2)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<1 (1 1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-0 (1)><1 (1)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><- (2)><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><1 (1)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (2)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<1-0 (2)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (2)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (2)><- (1)><- NIL>>>> <- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><1 (2)><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><- (2)><- NIL>>>> <0 (1)><- (2)><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <- (2)><- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><- (2)><- NIL>>> + + Faces : (<- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><- (2)><- NIL>>>> <- (2)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>>) + + Simplex : <<2 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1)><- (1 1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (2)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <- (2 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<2-0 (2)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (2)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-1 (1)><0 (2)><0 NIL><- NIL>>> + + Faces : (<- (2)><- NIL>>>> <1 (1)><- (2)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1 2)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>>) + + Simplex : <<0 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> >>) + + Simplex : <<- (1 1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <- (2 1)><0 NIL><- NIL>>>> <- (1 2)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1 (1)><1 (1)><- (1)><- NIL>>> + + Faces : (>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (2)><- NIL>>>> <1 (2)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<2-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2 (1 1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <1 (2)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 2)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-1 (2)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (2)><- (1)><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <- (2 1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><- (1 1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <1 (1)><- (2)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1 2)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<1 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2 (1 1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (2)><- (1)><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <- (2 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<1 (1 1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2 (1 2)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (2)><0 NIL><- NIL>>>> <1 (3)><0 NIL><- NIL>>>> <- (1 2)><0 NIL><- NIL>>>> <- (1 2)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-0 (2)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- (2)><- NIL>>>> <1 (2)><- (1)><- NIL>>>> <0 (2)><- (1)><- NIL>>>> <- (1 2)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (2)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <1 (2)><- (1)><- NIL>>>> <1 (2)><- (1)><- NIL>>>> <1 (3)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-1 (2)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2 (2 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (3)><0 NIL><- NIL>>>> <- (2 1)><0 NIL><- NIL>>>> <- (2 1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><1 (2)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (2)><- NIL>>>> <0 (1)><- (2)><- NIL>>>> <- (2 1)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1)><1 (2)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <1 (1)><- (2)><- NIL>>>> <1 (1)><- (2)><- NIL>>>> <1 (3)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <- (2)><- NIL>>>>) + + Simplex : <<2 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<0 (1 1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (2)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><1 (1)><- (1)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (2)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><0 (1)><- (1)><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<2-1 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1 (1)><1 (1)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (2)><- NIL>>>> <1 (2)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<2-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2 (1 1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <1 (2)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 2)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1 (1)><0 (1)><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<1 (1 1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-1 (2)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (2)><- (1)><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <- (2 1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2 (1 1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (2)><- (1)><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <- (2 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-0 (1)><0 (1)><- (1)><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (2)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<0 (1 1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <0 (2)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- NIL>>>>) + + Simplex : <<1 (1 1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-0 (2)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (2)><0 NIL><- NIL>>>> <1 (2)><- (1)><- NIL>>>> <0 (2)><- (1)><- NIL>>>> <- (1 2)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (2)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <1 (2)><- (1)><- NIL>>>> <1 (2)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2 (1 1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-0 (1)><1 (1)><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><- (2)><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<2-1 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1-0 NIL><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- NIL>>>>) + + Simplex : <<0 (1 1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (2)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- NIL>>>>) + + Simplex : <<1-0 (2)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- (2)><- NIL>>>> <- (2)><- NIL>>>> <0 (2)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-0 (2)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (2)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <0 (2)><- (1)><- NIL>>>> <0 (2)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><- (2)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><- (2)><- NIL>>>> <- (2)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><- (1 1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1)><- (1 1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (2)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <- (2 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 NIL><0 (2)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-1 (1)><0 (2)><0 NIL><- NIL>>> + + Faces : (<- (2)><- NIL>>>> <1 (1)><- (2)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1 2)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 NIL><1 (1)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1 (1)><1 (1)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (2)><- NIL>>>> <1 (2)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><0 (1)><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1 (1)><0 (1)><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><- (1 1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><- (1 1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <1 (1)><- (2)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1 2)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 NIL><0 (1)><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-0 (1)><0 (1)><- (1)><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (2)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><1 (2)><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-0 (1)><1 (2)><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><- (2)><- NIL>>>> <0 (1)><- (2)><- NIL>>>> <- (2 1)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1)><1-0 NIL><- (2)><- NIL>>> + + Faces : (<- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><- (2)><- NIL>>>> <1 (1)><- (2)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <- (2)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><- (1 1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<1-0 (1)><- (1 1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <0 (1)><- (2)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 NIL><1 (1)><- (1)><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-0 (1)><1 (1)><- (1)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><- (2)><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><1 (1)><- (1)><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><1 (1)><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (2)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><0 (1)><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><0 (1)><- (1)><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 NIL><- (1 1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 NIL><1 (1)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><1-0 NIL><- (2)><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><- (2)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 (1)><- (2)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>>) + + Simplex : <<2-0 (1)><1-0 NIL><- (2)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <0 (1)><- (2)><- NIL>>>> <0 (1)><- (2)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <- (2)><- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><0 (1)><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1 (1)><- (1 1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1 (1)><- (2)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <- (2 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1)><0 (2)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (2)><- NIL>>>> <1 (1)><- (2)><- NIL>>>> <- (1)><- NIL>>>> <- (1 2)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>>) + + Simplex : <<- (1 1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <- (2 1)><0 NIL><- NIL>>>> <- (1 2)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1)><1 (1)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (2)><- NIL>>>> <1 (2)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<2 (1 1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <1 (2)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 2)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1)><0 (1)><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<1 (1 1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (2)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1 (2)><- (1)><- NIL>>>> <- (2)><- NIL>>>> <- (2 1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><- (1 1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <1 (1)><- (2)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1 2)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<2 (1 1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (2)><- (1)><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <- (2 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><0 (1)><- (1)><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (2)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<0 (1 1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <0 (2)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<1 (1 1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-0 (2)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- (2)><- NIL>>>> <1 (2)><- (1)><- NIL>>>> <0 (2)><- (1)><- NIL>>>> <- (1 2)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 NIL><- (1 2)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (3)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- (1 2)><0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 NIL><1 (2)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (3)><- NIL>>>> <1 (2)><- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-0 (1)><1 (2)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (2)><- NIL>>>> <0 (1)><- (2)><- NIL>>>> <- (2 1)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 NIL><- (2 1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (3)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <- (2 1)><0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 NIL><1 (1)><- (2)><- NIL>>> + + Faces : (<- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (3)><- NIL>>>> <1 (1)><- (2)><- NIL>>>> <- (2)><- NIL>>>> <- (2)><- NIL>>>>) + + Simplex : <<1-0 (1)><- (1 1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <0 (1)><- (2)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><1 (1)><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><- (2)><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><- (1 1)><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <- (1 1)><- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<0 (1 1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (2)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><1 (1)><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (2)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<1-0 (2)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- (2)><- NIL>>>> <- (2)><- NIL>>>> <0 (2)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><0 (2)><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <0 (2)><- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><0 (1)><- (1)><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><- (2)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 (1)><- (2)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><0 (1)><- (2)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <0 (1)><- (2)><- NIL>>>> <- (2)><- NIL>>>> <- (2)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><0 (1)><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><1 (1)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><- (1 1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-1 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-1 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<1-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<1 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <1 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<1-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<0 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + +Dimension = 6: + + Simplex : <<3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (2)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (2)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1-0 (1)><1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><1-0 (1)><0 (1)><- (1)><- NIL>>> + + Faces : (<2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><1-0 (2)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <2-1-0 NIL><0 (2)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 (2)><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><1-0 (1)><1 (1)><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (2)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><0 (1 1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (2)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-0 (1)><1 (1)><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (2)><- NIL>>>> <2-1-0 NIL><- (1 1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><1-0 (1)><- (1 1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (2)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-0 (1)><1 (2)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (2)><- NIL>>>> <2-1-0 NIL><0 (1)><- (2)><- NIL>>>> <2-1-0 NIL><- (2 1)><0 NIL><- NIL>>>> <2-0 (1)><1 (2)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-0 (2)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (2)><- NIL>>>> <2-1-0 NIL><1 (2)><- (1)><- NIL>>>> <2-1-0 NIL><0 (2)><- (1)><- NIL>>>> <2-1-0 NIL><- (1 2)><0 NIL><- NIL>>>> <2-0 (2)><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><1 (1 1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><0 (1 1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (2)><- (1)><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-0 (1)><0 (1)><- (1)><- NIL>>> + + Faces : (<2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (2)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2 (1 1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1 (2)><- (1)><- NIL>>>> <2-1-0 NIL><- (1 1)><- (1)><- NIL>>>> <2-1-0 NIL><- (2 1)><0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-0 (1)><- (1 1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (2)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><- (1 2)><0 NIL><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-1 (2)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1 (2)><- (1)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <2-1-0 NIL><- (2 1)><0 NIL><- NIL>>>> <2-1 (2)><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><1 (1 1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><- (1 1)><- (1)><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-1 (1)><0 (1)><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><- (1 1)><- (1)><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2 (1 1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (2)><- (1)><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 2)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-1 (1)><1 (1)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (2)><- NIL>>>> <2-1-0 NIL><1 (2)><- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><- (1 1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (2 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 2)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-1 (1)><0 (2)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (2)><- NIL>>>> <2-1-0 NIL><1 (1)><- (2)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><- (1 2)><0 NIL><- NIL>>>> <2-1 (1)><0 (2)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-1 (1)><- (1 1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (2)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><- (2 1)><0 NIL><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (2)><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (2)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (2)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><- (2)><- NIL>>>> <1-0 (1)><1-0 NIL><- (2)><- NIL>>>> <1-0 (1)><1-0 NIL><- (2)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>> + + Faces : (<2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (2)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (2)><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (2)><0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (2)><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-0 (2)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (2)><0 NIL><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (2)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1-0 NIL><1 (2)><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><- (2)><- NIL>>>> <2-0 (1)><1-0 NIL><- (2)><- NIL>>>> <2-0 (1)><1 (2)><0 NIL><- NIL>>>> <2-0 (1)><1 (2)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (2)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>> + + Faces : (<2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (2)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2-1 (2)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (2)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (2)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2-1 (1)><0 (2)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-1-0 NIL><0 (2)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (2)><- NIL>>>> <2-1 (1)><1-0 NIL><- (2)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (2)><0 NIL><- NIL>>>> <2-1 (1)><0 (2)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (2)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (2)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-1-0 NIL><0 (1)><- (1)><- NIL>>> + + Faces : (<2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-1-0 NIL><1 (1)><- (1)><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (2)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (2)><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (2)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (2)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (2)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><- (2)><- NIL>>>> <1-0 (1)><1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (2)><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (2)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (2)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (2)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (2)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <2-0 (2)><1-0 NIL><- (1)><- NIL>>>> <1-0 (2)><1-0 NIL><- (1)><- NIL>>>> <1-0 (2)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (2)><1-0 NIL><- (1)><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (2)><0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <2 (1 1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-0 (2)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-0 (2)><1 (1)><0 NIL><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (2)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (2)><0 NIL><- NIL>>>> <2-1 (2)><1-0 NIL><- (1)><- NIL>>>> <2-0 (2)><1-0 NIL><- (1)><- NIL>>>> <2-0 (2)><1 (1)><0 NIL><- NIL>>>> <2-0 (2)><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-1 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><- (1)><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (2)><1-0 NIL><- (1)><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <2-0 (2)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (2)><1-0 NIL><- (1)><- NIL>>>> <2 (1 1)><1-0 NIL><- (1)><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2-1 (2)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (2)><0 (1)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (2)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1 (2)><1-0 NIL><- (1)><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <2-1 (2)><0 (1)><0 NIL><- NIL>>>> <2-1 (2)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2 (1 1)><1-0 NIL><- (1)><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <2 (1 1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (2)><1-0 NIL><- (1)><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (2)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-1 (2)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-1 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (2)><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (2)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (2)><0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-0 (2)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (2)><0 NIL><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1 (2)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (2)><0 NIL><- NIL>>>> <2-0 (1)><1 (2)><0 NIL><- NIL>>>> <2-0 (1)><1 (2)><0 NIL><- NIL>>>> <2 (2 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (2)><1-0 NIL><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>>) + + Simplex : <<3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-0 (2)><1 (1)><0 NIL><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (2)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (2)><0 NIL><- NIL>>>> <2-1 (2)><1 (1)><0 NIL><- NIL>>>> <2-0 (2)><1 (1)><0 NIL><- NIL>>>> <2-0 (2)><1 (1)><0 NIL><- NIL>>>> <2 (1 2)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (2)><1 (1)><0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <2 (2 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (2)><0 NIL><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2 (1 2)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2-1 (2)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (2)><0 (1)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (2)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (2)><1 (1)><0 NIL><- NIL>>>> <2-1 (2)><0 (1)><0 NIL><- NIL>>>> <2-1 (2)><0 (1)><0 NIL><- NIL>>>> <2 (2 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (2)><1 (1)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <2 (1 2)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (2)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-1 (1)><1 (2)><0 NIL><- NIL>>>> <2-1 (2)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<3 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (2 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 2)><1-0 NIL><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2-1 (1)><0 (2)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-0 (2)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (2)><0 NIL><- NIL>>>> <2-1 (1)><1 (2)><0 NIL><- NIL>>>> <2-1 (1)><0 (2)><0 NIL><- NIL>>>> <2-1 (1)><0 (2)><0 NIL><- NIL>>>> <2 (1 2)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (2)><1-0 NIL><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (2)><0 NIL><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2 (2 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-1 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (2)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (2)><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (2)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (2)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><1 (2)><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><- (2)><- NIL>>>> <1-0 (1)><1-0 NIL><- (2)><- NIL>>>> <1-0 (1)><1 (2)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (2)><0 NIL><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (2)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1-0 NIL><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-1-0 (2)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (2)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <1-0 (2)><1-0 NIL><- (1)><- NIL>>>> <1-0 (2)><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (2)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <1-0 (1)><1 (2)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (2)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <1-0 (1)><1 (2)><0 NIL><- NIL>>>> <1 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (2)><0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (2)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (2)><0 NIL><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (2)><0 NIL><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1 (2)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (2)><0 NIL><- NIL>>>> <2-0 (1)><1 (2)><0 NIL><- NIL>>>> <1-0 (1)><1 (2)><0 NIL><- NIL>>>> <1 (2 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (2)><1-0 NIL><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>>) + + Simplex : <<3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-0 (2)><1 (1)><0 NIL><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <1 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1 (1)><0 NIL><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-1 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <1 (1 1)><1 (1)><0 NIL><- NIL>>>> <1 (2 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2-1 (2)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (2)><0 (1)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (2)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-1 (2)><0 (1)><0 NIL><- NIL>>>> <2-1 (2)><0 (1)><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>> <1 (2 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1 1)><1 (1)><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1 1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<2 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (2 1)><1-0 NIL><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2-1 (1)><0 (2)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <1 (2 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><1-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><1 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (2)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (2)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-1-0 (2)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (2)><0 NIL><- NIL>>>> <1-0 (2)><1-0 NIL><- (1)><- NIL>>>> <1-0 (2)><1-0 NIL><- (1)><- NIL>>>> <1-0 (2)><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (2)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<1-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (2)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-0 (2)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (2)><0 NIL><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<3-1-0 (2)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (2)><0 NIL><- NIL>>>> <2-0 (2)><1 (1)><0 NIL><- NIL>>>> <2-0 (2)><1 (1)><0 NIL><- NIL>>>> <1-0 (2)><1 (1)><0 NIL><- NIL>>>> <1 (1 2)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-0 (2)><1 (1)><0 NIL><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <1-0 (2)><1 (1)><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (2)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1 2)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (2)><0 (1)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<2-1 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-1 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 2)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (2)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<1 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 2)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><1-0 (2)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (2)><0 NIL><- NIL>>>> <2-1 (1)><0 (2)><0 NIL><- NIL>>>> <2-1 (1)><0 (2)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1 2)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (2)><1-0 NIL><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2-1 (1)><0 (2)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><1-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (2)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (2)><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><0 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (2)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><0 (2)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (2)><- NIL>>>> <1-0 (1)><1-0 NIL><- (2)><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (2)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (2)><0 NIL><- NIL>>>> <1-0 NIL><- (2)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (2)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><0 (1)><- (1)><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (2)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-1-0 (2)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 (2)><1-0 NIL><- (1)><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <1-0 (2)><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (2)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (2)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <1-0 (1)><1 (1)><- (1)><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<1-0 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (2)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <0 (1)><- (1)><- NIL>>>> <0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (2)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (2)><0 NIL><- NIL>>>> <0 (1 1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (2)><0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-0 (2)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (2)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <1-0 (1)><0 (2)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-0 (2)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (2)><0 NIL><- NIL>>>> <2-0 (1)><1 (2)><0 NIL><- NIL>>>> <2-0 (1)><0 (2)><0 NIL><- NIL>>>> <1-0 (1)><0 (2)><0 NIL><- NIL>>>> <0 (2 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (2)><1-0 NIL><0 NIL><- NIL>>>> <1 (2)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (2)><0 NIL><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<3-1-0 (2)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-0 (2)><1 (1)><0 NIL><- NIL>>>> <2-0 (2)><0 (1)><0 NIL><- NIL>>>> <1-0 (2)><0 (1)><0 NIL><- NIL>>>> <0 (1 2)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-0 (2)><1 (1)><0 NIL><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-0 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<1-0 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <0 (1 1)><0 (1)><0 NIL><- NIL>>>> <1-0 (2)><0 (1)><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (2)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <0 (1 1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-0 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-0 (2)><0 (1)><0 NIL><- NIL>>>> <0 (1 1)><0 (1)><0 NIL><- NIL>>>> <0 (2 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2 (1 1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><0 (2)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1 2)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <1 (1)><- (1)><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2-1 (2)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <- NIL>>>>) + + Simplex : <<3-2-0 (2)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-1 (2)><0 (1)><0 NIL><- NIL>>>> <2-0 (2)><0 (1)><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>> <0 (2 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-1 (2)><0 (1)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<2-0 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <0 (1 1)><0 (1)><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><- (1)><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1 1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <2-1 (1)><0 (1)><- (1)><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <1 (1 1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (2)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <- (1)><- NIL>>>>) + + Simplex : <<3-0 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <2-0 (2)><0 (1)><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 2)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (2)><0 NIL><- NIL>>>> <2-0 (2)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <1 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<- (1)><- NIL>>>> <2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (2)><0 NIL><- NIL>>>> <2 (1 1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<1-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (2)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <0 NIL><- NIL>>>>) + + Simplex : <<0 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (2 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 2)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><1-0 (2)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (2)><0 NIL><- NIL>>>> <2-1 (1)><0 (2)><0 NIL><- NIL>>>> <2-0 (1)><0 (2)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1 2)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (2)><1-0 NIL><0 NIL><- NIL>>>> <0 (2)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<- (1 1)><0 NIL><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><0 (2)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <0 (2 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 NIL><- NIL>>>> <2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <2-1 (1)><0 (2)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + +Dimension = 7: + + Simplex : <<4-3-2-0 (1)><1-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (2)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-1-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (2)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><2-1-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-0 (1 1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (2)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (2)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><2-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><2-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-2-0 (1 1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-1-0 (1 1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (2)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (2)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (2)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (2)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-0 (1 1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1 1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <1-0 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1 1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (2)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (2)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><0 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (2)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (2)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><1-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (2)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-1-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (2)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><2-1-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1 (1 1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><2-1 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><2-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1 (1 1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-1-0 (1 1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (2)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-1 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (2)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1 (1 1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-1-0 (1 1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<2-1-0 (1 1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (2)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (2)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><1 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><2-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><2-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2 (1 1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (2)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (2)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><2-1 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><2-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-2-1 (1 1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-2-0 (1 1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (2)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-1 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (2)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1 (1 1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1 1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<2-1-0 (1 1)><3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (2)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (2)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><2 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (2)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (2)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (2)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-2-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (2)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2 (1 1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (2)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (2)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-1 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1 (1 1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-0 (1 1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (2)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (2)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3 (1 1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (2)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-2-1 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (2)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1 (1 1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-0 (1 1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-1-0 (1 1)><3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-2-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2 (1 1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (2)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (2)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1 (1 1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-0 (1 1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (2)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (2)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-2-1 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1 (1 1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-0 (1 1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-1-0 (1 1)><3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (2)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (2)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (2)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><- (1)><- NIL>>> + + Faces : (<0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (2)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><- (1)><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-2-1-0 NIL><0 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (2)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-2-1-0 NIL><2-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (2)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-2-1-0 NIL><1-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-2-1-0 NIL><1 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-2-1-0 NIL><1-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-1-0 NIL><2 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (2)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-2-1-0 NIL><2-1 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (2)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (2)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><- (1)><- NIL>>> + + Faces : (<1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (2)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><- (1)><- NIL>>> + + Faces : (<3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (2)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <0 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><1 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (2)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2 (1 1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><1 (1 1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>> <1-0 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (2)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2 (1 1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (2)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <1 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><1 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><- (1 1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2 (1 1)><1 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><0 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><0 (1 1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>> <1-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2 (1 1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2 (1 1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><1 (1 1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><1 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2 (1 1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2 (1 1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (2)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><0 (1 1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (2)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><- (1 1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <2 (1 1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><1 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><0 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><- (1 1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (2)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><1 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (2)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2 (1 1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>> <2-1 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><1 (1 1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><1 (1 1)><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><0 (1 1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><0 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><0 (1 1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><1 (1 1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (2)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><0 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (2)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><0 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><0 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><0 (1 1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><0 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (2)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>> + + Faces : (<1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (2)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 NIL><1 (1)><- (1)><- NIL>>>>) + + Simplex : <<3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><0 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-1-0 NIL><2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>> + + Faces : (<3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 NIL><0 (1)><- (1)><- NIL>>>>) + +Dimension = 8: + + Simplex : <<5-4-3-2-1-0 NIL><3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <4-3-2-1-0 NIL><2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <4-3-2-1-0 NIL><2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<5-4-3-2-1-0 NIL><3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <4-3-2-1-0 NIL><2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <4-3-2-1-0 NIL><2-1-0 (1)><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <4-3-2-1-0 NIL><2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-1-0 NIL><3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <4-3-2-1-0 NIL><2-1-0 (1)><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <4-3-2-1-0 NIL><2-1-0 (1)><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-1-0 NIL><4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <4-3-2-1-0 NIL><3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <4-3-2-1-0 NIL><2-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <4-3-2-1-0 NIL><1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<5-4-3-2-1-0 NIL><4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <4-3-2-1-0 NIL><3-1-0 (1)><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <4-3-2-1-0 NIL><3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><2-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-1-0 NIL><4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <4-3-2-1-0 NIL><3-1-0 (1)><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><2-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-1-0 NIL><4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <4-3-2-1-0 NIL><3-1-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <4-3-2-1-0 NIL><1-0 (1 1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<5-4-3-2-1-0 NIL><4-3-1-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-1-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-1-0 NIL><4-3-1-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-0 (1)><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-1-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-1-0 (1)><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-1-0 NIL><4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <4-3-2-1-0 NIL><3-2-0 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <4-3-2-1-0 NIL><3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><2-0 (1 1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-1-0 NIL><4-3-2-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-0 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-0 (1)><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-0 (1 1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-1-0 NIL><4-3-2-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-0 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-0 (1)><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-1-0 NIL><4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <4-3-2-1-0 NIL><3-2-1 (1)><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><2-1 (1 1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-1-0 NIL><4-3-2-1 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-1 (1)><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-1 (1)><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-1 (1 1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-1-0 NIL><4-3-2-1 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-1 (1)><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-1 (1)><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-1 (1)><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2 (1 1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-3-2-1-0 (1)><4-3-2-1-0 NIL><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <4-3-2-1-0 NIL><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<5-3-2-1-0 (1)><4-3-2-1-0 NIL><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <4-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <4-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-3-2-1-0 (1)><4-3-2-1-0 NIL><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-2-1-0 (1)><4-3-2-1-0 NIL><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <4-3-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <4-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-2-1-0 NIL><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<5-4-2-1-0 (1)><4-3-2-1-0 NIL><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <4-3-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <4-3-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-2-1-0 (1)><4-3-2-1-0 NIL><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-1-0 (1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-1-0 (1)><4-3-2-1-0 NIL><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <4-3-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-2-1-0 NIL><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<5-4-3-1-0 (1)><4-3-2-1-0 NIL><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1-0 NIL><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1-0 NIL><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-1-0 (1)><4-3-2-1-0 NIL><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1-0 NIL><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1-0 NIL><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-0 (1)><4-3-2-1-0 NIL><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <4-3-2-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <4-3-2-0 (1)><3-2-1-0 NIL><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-0 (1)><4-3-2-1-0 NIL><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1-0 NIL><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1-0 NIL><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-0 (1)><4-3-2-1-0 NIL><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1-0 NIL><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-1 (1)><4-3-2-1-0 NIL><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <4-3-2-1 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-1-0 NIL><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-1 (1)><4-3-2-1-0 NIL><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-1-0 NIL><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-1-0 NIL><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-1-0 NIL><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-1 (1)><4-3-2-1-0 NIL><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-1-0 NIL><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-1-0 NIL><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 (1)><4-3-2-1-0 NIL><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <4-3-2-1-0 NIL><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-1-0 (1)><4-3-2-1-0 NIL><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><- (1)><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 (1)><4-3-2-1-0 NIL><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><- (1 1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-2-1-0 (1)><4-3-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-1-0 (1 1)><3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<5-4-2-1-0 (1)><4-3-2-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-2-0 (1 1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-2-1-0 (1)><4-3-2-1 (1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-1-0 (1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-2-1 (1 1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-1-0 (1)><4-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-1-0 (1 1)><3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<5-4-3-1-0 (1)><4-3-2-0 (1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-0 (1 1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-1-0 (1)><4-3-2-1 (1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1 (1 1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-0 (1)><4-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-2-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-2-0 (1)><3-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-2-0 (1 1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-0 (1)><4-3-1-0 (1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-0 (1 1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-0 (1)><4-3-2-1 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2 (1 1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-1 (1)><4-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-2-1 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-2-1 (1 1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-1 (1)><4-3-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1 (1 1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-1 (1)><4-3-2-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2 (1 1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 (1)><4-3-2-1-0 NIL><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-2-1-0 NIL><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-1-0 (1)><4-3-2-1-0 NIL><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 (1)><4-3-2-1-0 NIL><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-3-2-1-0 (1)><4-3-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1 1)><3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<5-3-2-1-0 (1)><4-3-2-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1 1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-3-2-1-0 (1)><4-3-2-1 (1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1 1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-1-0 (1)><3-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1 1)><3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<5-4-3-1-0 (1)><4-3-2-0 (1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-0 (1 1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-1-0 (1)><4-3-2-1 (1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-1 (1 1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-0 (1)><3-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-0 (1 1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-0 (1)><4-3-1-0 (1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-1 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-0 (1 1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-0 (1)><4-3-2-1 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-1 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-2 (1 1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-1 (1)><3-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1 1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-1 (1)><4-3-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-1 (1 1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-1 (1)><4-3-2-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-2 (1 1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 (1)><4-3-2-1-0 NIL><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-2-1-0 NIL><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-1-0 (1)><4-3-2-1-0 NIL><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 (1)><4-3-2-1-0 NIL><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-3-2-1-0 (1)><4-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-2-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1 1)><3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<5-3-2-1-0 (1)><4-3-2-0 (1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1 1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-3-2-1-0 (1)><4-3-2-1 (1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1 1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-2-1-0 (1)><3-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>> + + Faces : (<3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-2-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1 1)><3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<5-4-2-1-0 (1)><4-3-2-0 (1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-2-0 (1 1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-2-1-0 (1)><4-3-2-1 (1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-2-1 (1 1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-0 (1)><3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><2-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1 1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-0 (1)><4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><2-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><2-1 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-2-0 (1 1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-0 (1)><4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><2-1 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-2 (1 1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-1 (1)><3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><2-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1 1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-1 (1)><4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><2-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><2-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-2-1 (1 1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-1 (1)><4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><2-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-2 (1 1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 (1)><4-3-2-1-0 NIL><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-1-0 (1)><4-3-2-1-0 NIL><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 (1)><4-3-2-1-0 NIL><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><1 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-3-2-1-0 (1)><4-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1 1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<5-3-2-1-0 (1)><4-3-1-0 (1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1 1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-3-2-1-0 (1)><4-3-2-1 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1 1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-2-1-0 (1)><3-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1 1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<5-4-2-1-0 (1)><4-3-1-0 (1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-1 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-1-0 (1 1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-2-1-0 (1)><4-3-2-1 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-1 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-2-1 (1 1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-1-0 (1)><3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-1-0 (1)><2-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1 1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-1-0 (1)><4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><2-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><2-1 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-1-0 (1 1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-1-0 (1)><4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><2-1 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-1 (1 1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-1 (1)><3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><2-1-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1 1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-1 (1)><4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-1-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><2-1-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><1-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-2-1 (1 1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-1 (1)><4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-1-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><1-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-1 (1 1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 (1)><4-3-2-1-0 NIL><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 NIL><1-0 (1)><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<4-3-2-1-0 (1)><4-3-2-1-0 NIL><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-0 (1)><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<4-3-2-1-0 (1)><4-3-2-1-0 NIL><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><0 (1 1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1-0 NIL><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 NIL><2-1 (1)><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-3-2-1-0 (1)><4-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1 1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<5-3-2-1-0 (1)><4-3-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1 1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-3-2-1-0 (1)><4-3-2-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1 1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-2-1-0 (1)><3-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-2-1-0 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1 1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1-0 NIL><- (1)><- NIL>>>>) + + Simplex : <<5-4-2-1-0 (1)><4-3-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-1-0 (1 1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-2-1-0 (1)><4-3-2-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-2-0 (1 1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-1-0 (1)><3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-1-0 (1)><2-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1 1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><1 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-1-0 (1)><4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><2-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><2-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-1-0 (1 1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-2-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-1 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-1-0 (1)><4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><2-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-0 (1 1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-1 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-0 (1)><3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-1 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <4-3-2-0 (1)><2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><2-1-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1 1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-1-0 (1)><3-2-1-0 NIL><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <2-1-0 (1)><2-1-0 NIL><0 (1)><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-0 (1)><4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-1-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><2-1-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><1-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-2-0 (1 1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-2-1-0 (1)><3-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-1-0 (1)><2-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + + Simplex : <<5-4-3-2-0 (1)><4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>> + + Faces : (<3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-1 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><3-1-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>> <4-3-2-0 (1)><1-0 (1 1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-0 (1 1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <4-3-1-0 (1)><2-1-0 (1)><2-1-0 NIL><1-0 NIL><0 NIL><- NIL>>>> <3-2-0 (1)><1-0 (1)><1-0 NIL><0 NIL><- NIL>>>>) + diff --git a/src/ext/kenzo/README.txt b/src/ext/kenzo/README.txt new file mode 100644 index 00000000000..9943fbd25fb --- /dev/null +++ b/src/ext/kenzo/README.txt @@ -0,0 +1,49 @@ +These files contain code for producing simplicial set structures for spaces homotopy equivalent to n-dimensional complex projective space, using the algorithm described in "Triangulations of complex projective spaces" by Sergeraert. The f-vectors for these models for CP^n: + +n=2: 1 0 2 3 3 +n=3: 1 0 3 10 25 30 15 +n=4: 1 0 4 22 97 255 390 315 105 +n=5: 1 0 5 40 271 1197 3381 5975 6405 3780 945 +n=6: 1 0 6 65 627 4162 18496 54789 107933 139230 112770 51975 10395 + +Kenzo: +- https://www-fourier.ujf-grenoble.fr/~sergerar/Kenzo/ +- https://github.com/gheber/kenzo + +The results for CP^2, CP^3, and CP^4 have been saved in the corresponding text files. The file S4.txt includes the 4-sphere, just for testing purposes. These files can be processed by the function "simplicial_data_from_kenzo_output" in sage/homology/simplicial_set.py. To get a simplicial set structure for CP^n using Kenzo in sbcl, do the following. + +;; +;; Start Kenzo. +;; +(require :asdf) +(require :kenzo) +(in-package "CAT") +;; +;; Define K(Z,2). +;; +(setf kz2 (k-z 2)) +;; +;; Define effective homology version of K(Z,2). +;; +(setf efhm-kz2 (efhm kz2)) +;; +;; The previous command produces output of the form +;; [K153 Homotopy-Equivalence K13 <= K143 => K139] +;; +;; In the following, replace "139" with the right-hand number. +;; Replace "4" with the desired dimension: 2n if you're constructing +;; CP^n. +;; +;; That is, the point is to find the smallest subcomplex of K(Z,2) +;; which contains the given homology class. If you replace "4" with +;; "2n", this should give a complex homotopy equivalent to CP^n. +;; +(chcm-homology-gen (k 139) 4) +(setf g (first *)) +(setf z4 (lf efhm-kz2 (rg efhm-kz2 g))) +(multiple-value-setq (ssz4 incl) (gmsms-subsmst kz2 z4)) +;; +;; Now ssz4 is a model for the 4-dimensional complex CP^2, so display +;; its nondegenerate simplices through dimension 4. +;; +(show-structure ssz4 4) diff --git a/src/ext/kenzo/S4.txt b/src/ext/kenzo/S4.txt new file mode 100644 index 00000000000..f165a94d6b5 --- /dev/null +++ b/src/ext/kenzo/S4.txt @@ -0,0 +1,20 @@ +;; The 4-sphere. + +* (show-structure S4 4) + + +Dimension = 0: + + Vertices : (*) + +Dimension = 1: + +Dimension = 2: + +Dimension = 3: + +Dimension = 4: + + Simplex : S4 + + Faces : ( ) diff --git a/src/ext/threejs/threejs_template.html b/src/ext/threejs/threejs_template.html index c64ad1ce516..b1c6a5bab13 100644 --- a/src/ext/threejs/threejs_template.html +++ b/src/ext/threejs/threejs_template.html @@ -2,8 +2,8 @@ - - + +