diff --git a/Linux/_bz2.so b/Linux/_bz2.so new file mode 100755 index 0000000..ecf6542 Binary files /dev/null and b/Linux/_bz2.so differ diff --git a/Linux/_codecs_cn.so b/Linux/_codecs_cn.so new file mode 100755 index 0000000..e9bd648 Binary files /dev/null and b/Linux/_codecs_cn.so differ diff --git a/Linux/_codecs_hk.so b/Linux/_codecs_hk.so new file mode 100755 index 0000000..3181580 Binary files /dev/null and b/Linux/_codecs_hk.so differ diff --git a/Linux/_codecs_iso2022.so b/Linux/_codecs_iso2022.so new file mode 100755 index 0000000..cdc1d44 Binary files /dev/null and b/Linux/_codecs_iso2022.so differ diff --git a/Linux/_codecs_jp.so b/Linux/_codecs_jp.so new file mode 100755 index 0000000..71d6571 Binary files /dev/null and b/Linux/_codecs_jp.so differ diff --git a/Linux/_codecs_kr.so b/Linux/_codecs_kr.so new file mode 100755 index 0000000..53eb624 Binary files /dev/null and b/Linux/_codecs_kr.so differ diff --git a/Linux/_codecs_tw.so b/Linux/_codecs_tw.so new file mode 100755 index 0000000..2048515 Binary files /dev/null and b/Linux/_codecs_tw.so differ diff --git a/Linux/_ctypes.so b/Linux/_ctypes.so new file mode 100755 index 0000000..8cc081a Binary files /dev/null and b/Linux/_ctypes.so differ diff --git a/Linux/_decimal.so b/Linux/_decimal.so new file mode 100755 index 0000000..3fd5e19 Binary files /dev/null and b/Linux/_decimal.so differ diff --git a/Linux/_hashlib.so b/Linux/_hashlib.so new file mode 100755 index 0000000..057a8f1 Binary files /dev/null and b/Linux/_hashlib.so differ diff --git a/Linux/_lzma.so b/Linux/_lzma.so new file mode 100755 index 0000000..d4dd8cf Binary files /dev/null and b/Linux/_lzma.so differ diff --git a/Linux/_multibytecodec.so b/Linux/_multibytecodec.so new file mode 100755 index 0000000..1b6592b Binary files /dev/null and b/Linux/_multibytecodec.so differ diff --git a/Linux/_opcode.so b/Linux/_opcode.so new file mode 100755 index 0000000..dd97093 Binary files /dev/null and b/Linux/_opcode.so differ diff --git a/Linux/_ssl.so b/Linux/_ssl.so new file mode 100755 index 0000000..8d058b7 Binary files /dev/null and b/Linux/_ssl.so differ diff --git a/Linux/base_library.zip b/Linux/base_library.zip new file mode 100755 index 0000000..8a81122 Binary files /dev/null and b/Linux/base_library.zip differ diff --git a/Linux/input.txt b/Linux/input.txt new file mode 100755 index 0000000..2114ff2 --- /dev/null +++ b/Linux/input.txt @@ -0,0 +1,61 @@ +8 4 +7, 8, 6; x, x, x +7, 3, 8; α, α, x +6, 8, 2; 180 - α - β - γ, x, 180 - α - β - γ +8, 3, 2; x, γ, γ +3, 5, 2; β, x, β +3, 4, 5; 180 - β - α - γ, 180 - β - α - γ, x +5, 4, 1; x, x, x +2, 5, 1; α, x, α +two circle 2 + +8 5 +7, 8, 6; x, x, x +7, 3, 8; γ, γ, x +6, 8, 2; 180 - α - β - δ, x, 180 - α - β - δ +8, 3, 2; x, δ, δ +3, 5, 2; β, x, β +3, 4, 5; 180 - β - γ - δ, 180 - β - γ - δ, x +5, 4, 1; x, x, x +2, 5, 1; α, x, α +two circles 1 + +9 3 +2, 3, 6; 45 - α - β, β, x +6, 3, 7; x, β, x +2, 6, 7; 45 - α - β, x, x +7, 3, 4; x, β, x +4, 3, 1; x, β, α +7, 4, 1; x, x, α +2, 7, 5; 45 - α - β, x, x +5, 7, 1; x, x, α +2, 5, 1; 45 - α - β, x, α +quadriceptors + +6 4 +2, 3, 7; γ, -1/3α - 1/3β - 1/3γ + 120, x +3, 4, 7; -1/3α - 1/3β - 1/3γ + 120, β, x +7, 4, 5; x, β, -1/3α - 1/3β - 1/3γ + 120 +7, 5, 6; x, -1/3α - 1/3β - 1/3γ + 120, α +1, 7, 6; -1/3α - 1/3β - 1/3γ + 120, x, α +2, 7, 1; γ, x, -1/3α - 1/3β - 1/3γ + 120 +bisectors + +10 5 +3, 4, 9; γ, 120 - 1/2α - 1/2β - 1/2γ, x +4, 5, 9; 120 - 1/2α - 1/2β - 1/2γ, β, x +9, 5, 7; x, β, x +7, 5, 6; x, β, 120 - 1/2α - 1/2β - 1/2γ +7, 6, 1; x, 120 - 1/2α - 1/2β - 1/2γ, α +8, 7, 1; x, x, α +2, 8, 1; 120 - 1/2α - 1/2β - 1/2γ, x, α +3, 8, 2; γ, x, 120 - 1/2α - 1/2β - 1/2γ +3, 9, 8; γ, x, x +9, 7, 8; 60, 60, 60 +generalized morley + +3 3 +2, 4, 1; β, x, α +2, 3, 4; x, α, x +4, 3, 1; x, β, x +3-in-one triangle \ No newline at end of file diff --git a/Linux/libbz2.so.1.0 b/Linux/libbz2.so.1.0 new file mode 100755 index 0000000..841a81a Binary files /dev/null and b/Linux/libbz2.so.1.0 differ diff --git a/Linux/libcrypto.so.1.0.0 b/Linux/libcrypto.so.1.0.0 new file mode 100755 index 0000000..845dd6c Binary files /dev/null and b/Linux/libcrypto.so.1.0.0 differ diff --git a/Linux/libexpat.so.1 b/Linux/libexpat.so.1 new file mode 100755 index 0000000..c403776 Binary files /dev/null and b/Linux/libexpat.so.1 differ diff --git a/Linux/liblzma.so.5 b/Linux/liblzma.so.5 new file mode 100755 index 0000000..1ea7b3e Binary files /dev/null and b/Linux/liblzma.so.5 differ diff --git a/Linux/libmpdec.so.2 b/Linux/libmpdec.so.2 new file mode 100755 index 0000000..ec19d32 Binary files /dev/null and b/Linux/libmpdec.so.2 differ diff --git a/Linux/libpython3.5m.so.1.0 b/Linux/libpython3.5m.so.1.0 new file mode 100755 index 0000000..d082900 Binary files /dev/null and b/Linux/libpython3.5m.so.1.0 differ diff --git a/Linux/libreadline.so.6 b/Linux/libreadline.so.6 new file mode 100755 index 0000000..dd3601b Binary files /dev/null and b/Linux/libreadline.so.6 differ diff --git a/Linux/libssl.so.1.0.0 b/Linux/libssl.so.1.0.0 new file mode 100755 index 0000000..0837974 Binary files /dev/null and b/Linux/libssl.so.1.0.0 differ diff --git a/Linux/libtinfo.so.5 b/Linux/libtinfo.so.5 new file mode 100755 index 0000000..123f8e4 Binary files /dev/null and b/Linux/libtinfo.so.5 differ diff --git a/Linux/libz.so.1 b/Linux/libz.so.1 new file mode 100755 index 0000000..0d8242a Binary files /dev/null and b/Linux/libz.so.1 differ diff --git a/Linux/readline.so b/Linux/readline.so new file mode 100755 index 0000000..2ab5cd6 Binary files /dev/null and b/Linux/readline.so differ diff --git a/Linux/resource.so b/Linux/resource.so new file mode 100755 index 0000000..d89ee72 Binary files /dev/null and b/Linux/resource.so differ diff --git a/Linux/run b/Linux/run new file mode 100755 index 0000000..ad8eed1 Binary files /dev/null and b/Linux/run differ diff --git a/Linux/termios.so b/Linux/termios.so new file mode 100755 index 0000000..4d8dd4f Binary files /dev/null and b/Linux/termios.so differ diff --git a/Mac, Linux/_bisect.so b/Mac/_bisect.so similarity index 100% rename from Mac, Linux/_bisect.so rename to Mac/_bisect.so diff --git a/Mac, Linux/_bz2.so b/Mac/_bz2.so similarity index 100% rename from Mac, Linux/_bz2.so rename to Mac/_bz2.so diff --git a/Mac, Linux/_codecs_cn.so b/Mac/_codecs_cn.so similarity index 100% rename from Mac, Linux/_codecs_cn.so rename to Mac/_codecs_cn.so diff --git a/Mac, Linux/_codecs_hk.so b/Mac/_codecs_hk.so similarity index 100% rename from Mac, Linux/_codecs_hk.so rename to Mac/_codecs_hk.so diff --git a/Mac, Linux/_codecs_iso2022.so b/Mac/_codecs_iso2022.so similarity index 100% rename from Mac, Linux/_codecs_iso2022.so rename to Mac/_codecs_iso2022.so diff --git a/Mac, Linux/_codecs_jp.so b/Mac/_codecs_jp.so similarity index 100% rename from Mac, Linux/_codecs_jp.so rename to Mac/_codecs_jp.so diff --git a/Mac, Linux/_codecs_kr.so b/Mac/_codecs_kr.so similarity index 100% rename from Mac, Linux/_codecs_kr.so rename to Mac/_codecs_kr.so diff --git a/Mac, Linux/_codecs_tw.so b/Mac/_codecs_tw.so similarity index 100% rename from Mac, Linux/_codecs_tw.so rename to Mac/_codecs_tw.so diff --git a/Mac, Linux/_ctypes.so b/Mac/_ctypes.so similarity index 100% rename from Mac, Linux/_ctypes.so rename to Mac/_ctypes.so diff --git a/Mac, Linux/_datetime.so b/Mac/_datetime.so similarity index 100% rename from Mac, Linux/_datetime.so rename to Mac/_datetime.so diff --git a/Mac, Linux/_decimal.so b/Mac/_decimal.so similarity index 100% rename from Mac, Linux/_decimal.so rename to Mac/_decimal.so diff --git a/Mac, Linux/_hashlib.so b/Mac/_hashlib.so similarity index 100% rename from Mac, Linux/_hashlib.so rename to Mac/_hashlib.so diff --git a/Mac, Linux/_heapq.so b/Mac/_heapq.so similarity index 100% rename from Mac, Linux/_heapq.so rename to Mac/_heapq.so diff --git a/Mac, Linux/_lzma.so b/Mac/_lzma.so similarity index 100% rename from Mac, Linux/_lzma.so rename to Mac/_lzma.so diff --git a/Mac, Linux/_md5.so b/Mac/_md5.so similarity index 100% rename from Mac, Linux/_md5.so rename to Mac/_md5.so diff --git a/Mac, Linux/_multibytecodec.so b/Mac/_multibytecodec.so similarity index 100% rename from Mac, Linux/_multibytecodec.so rename to Mac/_multibytecodec.so diff --git a/Mac, Linux/_opcode.so b/Mac/_opcode.so similarity index 100% rename from Mac, Linux/_opcode.so rename to Mac/_opcode.so diff --git a/Mac, Linux/_pickle.so b/Mac/_pickle.so similarity index 100% rename from Mac, Linux/_pickle.so rename to Mac/_pickle.so diff --git a/Mac, Linux/_posixsubprocess.so b/Mac/_posixsubprocess.so similarity index 100% rename from Mac, Linux/_posixsubprocess.so rename to Mac/_posixsubprocess.so diff --git a/Mac, Linux/_random.so b/Mac/_random.so similarity index 100% rename from Mac, Linux/_random.so rename to Mac/_random.so diff --git a/Mac, Linux/_scproxy.so b/Mac/_scproxy.so similarity index 100% rename from Mac, Linux/_scproxy.so rename to Mac/_scproxy.so diff --git a/Mac, Linux/_sha1.so b/Mac/_sha1.so similarity index 100% rename from Mac, Linux/_sha1.so rename to Mac/_sha1.so diff --git a/Mac, Linux/_sha256.so b/Mac/_sha256.so similarity index 100% rename from Mac, Linux/_sha256.so rename to Mac/_sha256.so diff --git a/Mac, Linux/_sha512.so b/Mac/_sha512.so similarity index 100% rename from Mac, Linux/_sha512.so rename to Mac/_sha512.so diff --git a/Mac, Linux/_socket.so b/Mac/_socket.so similarity index 100% rename from Mac, Linux/_socket.so rename to Mac/_socket.so diff --git a/Mac, Linux/_ssl.so b/Mac/_ssl.so similarity index 100% rename from Mac, Linux/_ssl.so rename to Mac/_ssl.so diff --git a/Mac, Linux/_struct.so b/Mac/_struct.so similarity index 100% rename from Mac, Linux/_struct.so rename to Mac/_struct.so diff --git a/Mac, Linux/base_library.zip b/Mac/base_library.zip similarity index 100% rename from Mac, Linux/base_library.zip rename to Mac/base_library.zip diff --git a/Mac, Linux/binascii.so b/Mac/binascii.so similarity index 100% rename from Mac, Linux/binascii.so rename to Mac/binascii.so diff --git a/Mac, Linux/grp.so b/Mac/grp.so similarity index 100% rename from Mac, Linux/grp.so rename to Mac/grp.so diff --git a/Mac, Linux/input.txt b/Mac/input.txt similarity index 100% rename from Mac, Linux/input.txt rename to Mac/input.txt diff --git a/Mac, Linux/libcrypto.1.0.0.dylib b/Mac/libcrypto.1.0.0.dylib similarity index 100% rename from Mac, Linux/libcrypto.1.0.0.dylib rename to Mac/libcrypto.1.0.0.dylib diff --git a/Mac, Linux/liblzma.5.dylib b/Mac/liblzma.5.dylib similarity index 100% rename from Mac, Linux/liblzma.5.dylib rename to Mac/liblzma.5.dylib diff --git a/Mac, Linux/libpython3.5m.dylib b/Mac/libpython3.5m.dylib similarity index 100% rename from Mac, Linux/libpython3.5m.dylib rename to Mac/libpython3.5m.dylib diff --git a/Mac, Linux/libreadline.6.2.dylib b/Mac/libreadline.6.2.dylib similarity index 100% rename from Mac, Linux/libreadline.6.2.dylib rename to Mac/libreadline.6.2.dylib diff --git a/Mac, Linux/libssl.1.0.0.dylib b/Mac/libssl.1.0.0.dylib similarity index 100% rename from Mac, Linux/libssl.1.0.0.dylib rename to Mac/libssl.1.0.0.dylib diff --git a/Mac, Linux/libz.1.dylib b/Mac/libz.1.dylib similarity index 100% rename from Mac, Linux/libz.1.dylib rename to Mac/libz.1.dylib diff --git a/Mac, Linux/math.so b/Mac/math.so similarity index 100% rename from Mac, Linux/math.so rename to Mac/math.so diff --git a/Mac, Linux/pyexpat.so b/Mac/pyexpat.so similarity index 100% rename from Mac, Linux/pyexpat.so rename to Mac/pyexpat.so diff --git a/Mac, Linux/readline.so b/Mac/readline.so similarity index 100% rename from Mac, Linux/readline.so rename to Mac/readline.so diff --git a/Mac, Linux/resource.so b/Mac/resource.so similarity index 100% rename from Mac, Linux/resource.so rename to Mac/resource.so diff --git a/Mac, Linux/run b/Mac/run similarity index 100% rename from Mac, Linux/run rename to Mac/run diff --git a/Mac, Linux/select.so b/Mac/select.so similarity index 100% rename from Mac, Linux/select.so rename to Mac/select.so diff --git a/Mac, Linux/termios.so b/Mac/termios.so similarity index 100% rename from Mac, Linux/termios.so rename to Mac/termios.so diff --git a/Mac, Linux/unicodedata.so b/Mac/unicodedata.so similarity index 100% rename from Mac, Linux/unicodedata.so rename to Mac/unicodedata.so diff --git a/Mac, Linux/zlib.so b/Mac/zlib.so similarity index 100% rename from Mac, Linux/zlib.so rename to Mac/zlib.so diff --git a/README.md b/README.md index 439f75b..08a3228 100644 --- a/README.md +++ b/README.md @@ -22,13 +22,24 @@ To run Geopar: 3. Prepare input.txt so that the triangulated figure you want to deal with is specified first 4. Type `run.exe` to run the executable -## Running on Mac and Linux -Mac and Linux executables are located in a folder **Mac, Linux**. +## Running on Mac +Mac executables are located in a folder **Mac**. _input.txt_ contains all Triangulated Figure configurations. The configuration of interest should be moved to the top in _input.txt_, since Geopar runs only one configuration. To run Geopar: 1. Open Terminal -2. Navigate to the **Mac, Linux** folder in the downloaded directory +2. Navigate to the **Mac** folder in the downloaded directory +3. Type `./run` to run the executable + +## Running on Linux +Mac executables are located in a folder **Linux**. +_input.txt_ contains all Triangulated Figure configurations. +The configuration of interest should be moved to the top in _input.txt_, +since Geopar runs only one configuration. + +To run Geopar: +1. Open Terminal +2. Navigate to the **Linux** folder in the downloaded directory 3. Type `./run` to run the executable