Merge remote-tracking branch 'upstream/master'

2 files changed, 42 insertions, 0 deletions

diff --git a/challenge-112/abigail/python/ch-1.py b/challenge-112/abigail/python/ch-1.py
new file mode 100644
index 0000000000..bf52e6d83c
--- /dev/null
+++ b/challenge-112/abigail/python/ch-1.py
@@ -0,0 +1,24 @@
+#!/opt/local/bin/python
+
+#
+# See ../README.md
+#
+
+#
+# Run as: python ch-1.py < input-file
+#
+
+import fileinput
+
+for line in fileinput . input ():
+    parts  = line . rstrip () . split ("/")   # Split input on /
+    parts2 = []
+    for part in parts:
+        if part == "" or part == ".":         # Skip empty parts,
+            continue                          # and current directory.
+        if part == "..":                      # Pop parent directory
+            if len (parts2):
+                parts2 . pop ()
+            continue
+        parts2 . append (part)                # Else, append.
+    print ("/" + "/" . join (parts2))         # Print result.
diff --git a/challenge-112/abigail/python/ch-2.py b/challenge-112/abigail/python/ch-2.py
new file mode 100644
index 0000000000..da542b06f2
--- /dev/null
+++ b/challenge-112/abigail/python/ch-2.py
@@ -0,0 +1,18 @@
+#!/opt/local/bin/python
+
+#
+# See ../README.md
+#
+
+#
+# Run as: python ch-2.py < input-file
+#
+
+import fileinput
+from math import sqrt
+
+SQRT5 = sqrt (5)
+PHI   = (1 + SQRT5) / 2
+
+for line in fileinput . input ():
+    print (round (pow (PHI, int (line) + 1) / SQRT5))