diff --git a/arrays_strings/compress/compress_challenge.ipynb b/arrays_strings/compress/compress_challenge.ipynb index b1f3afe..fb17544 100644 --- a/arrays_strings/compress/compress_challenge.ipynb +++ b/arrays_strings/compress/compress_challenge.ipynb @@ -18,7 +18,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "## Problem: Compress a string such that 'AAABCCDDDD' becomes 'A3BCCD4'. Only compress the string if it saves space.\n", + "## Problem: Compress a string such that 'AAABCCDDDD' becomes 'A3B1C2D4'. Only compress the string if it saves space.\n", "\n", "* [Constraints](#Constraints)\n", "* [Test Cases](#Test-Cases)\n", @@ -52,7 +52,7 @@ "* None -> None\n", "* '' -> ''\n", "* 'AABBCC' -> 'AABBCC'\n", - "* 'AAABCCDDDD' -> 'A3BCCD4'" + "* 'AAABCCDDDD' -> 'A3B1C2D4'" ] }, { @@ -118,7 +118,7 @@ " assert_equal(func(None), None)\n", " assert_equal(func(''), '')\n", " assert_equal(func('AABBCC'), 'AABBCC')\n", - " assert_equal(func('AAABCCDDDD'), 'A3BCCD4')\n", + " assert_equal(func('AAABCCDDDD'), 'A3B1C2D4')\n", " print('Success: test_compress')\n", "\n", "\n", @@ -143,21 +143,21 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3", + "display_name": "Python 2", "language": "python", - "name": "python3" + "name": "python2" }, "language_info": { "codemirror_mode": { "name": "ipython", - "version": 3 + "version": 2 }, "file_extension": ".py", "mimetype": "text/x-python", "name": "python", "nbconvert_exporter": "python", - "pygments_lexer": "ipython3", - "version": "3.4.3" + "pygments_lexer": "ipython2", + "version": "2.7.10" } }, "nbformat": 4, diff --git a/arrays_strings/compress/compress_solution.ipynb b/arrays_strings/compress/compress_solution.ipynb index 3770c03..aa11798 100644 --- a/arrays_strings/compress/compress_solution.ipynb +++ b/arrays_strings/compress/compress_solution.ipynb @@ -18,7 +18,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "## Problem: Compress a string such that 'AAABCCDDDD' becomes 'A3BCCD4'. Only compress the string if it saves space.\n", + "## Problem: Compress a string such that 'AAABCCDDDD' becomes 'A3B1C2D4'. Only compress the string if it saves space.\n", "\n", "* [Constraints](#Constraints)\n", "* [Test Cases](#Test-Cases)\n", @@ -51,7 +51,7 @@ "* None -> None\n", "* '' -> ''\n", "* 'AABBCC' -> 'AABBCC'\n", - "* 'AAABCCDDDD' -> 'A3BCCD4'" + "* 'AAABCCDDDD' -> 'A3B1C2D4'" ] }, { @@ -69,20 +69,10 @@ " * For each char in string\n", " * If char is the same as last_char, increment count\n", " * Else\n", - " * If the count is more than 2\n", - " * Append last_char to compressed_string\n", - " * append count to compressed_string\n", - " * count = 1\n", - " * last_char = char\n", - " * If count is 1\n", - " * Append last_char to compressed_string\n", - " * count = 1\n", - " * last_char = char\n", - " * If count is 2\n", - " * Append last_char to compressed_string\n", - " * Append last_char to compressed_string once more\n", - " * count = 1\n", - " * last_char = char\n", + " * Append last_char to compressed_string\n", + " * append count to compressed_string\n", + " * count = 1\n", + " * last_char = char\n", " * Append last_char to compressed_string\n", " * Append count to compressed_string\n", " * Return compressed_string\n", @@ -101,66 +91,47 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 1, "metadata": { "collapsed": false }, "outputs": [], "source": [ "def compress_string(string):\n", - "\tif string is None or len(string) == 0:\n", - "\t\treturn string\n", + " if string is None or len(string) == 0:\n", + " return string\n", "\n", - "\t# Calculate the size of the compressed string\n", - "\tsize = 0\n", - "\tlast_char = string[0]\n", - "\tfor char in string:\n", - "\t\tif char != last_char:\n", - "\t\t\tsize += 2\n", - "\t\t\tlast_char = char\n", - "\tsize += 2\n", + " # Calculate the size of the compressed string\n", + " size = 0\n", + " last_char = string[0]\n", + " for char in string:\n", + " if char != last_char:\n", + " size += 2\n", + " last_char = char\n", + " size += 2\n", "\n", - "\t# If the compressed string size is greater than\n", - "\t# or equal to string size, return original string\n", - "\tif size >= len(string):\n", - "\t\treturn string\n", + " # If the compressed string size is greater than\n", + " # or equal to string size, return original string\n", + " if size >= len(string):\n", + " return string\n", "\n", - "\t# Create compressed_string\n", - "\t# New objective:\n", - "\t\t# Single characters are to be left as is\n", - "\t\t# Double characters are to be left as are\n", - "\tcompressed_string = list()\n", - "\tcount = 0\n", - "\tlast_char = string[0]\n", - "\tfor char in string:\n", - "\t\tif char == last_char:\n", - "\t\t\tcount += 1\n", - "\t\telse:\n", - "\t\t\t# Do the old compression tricks only if count exceeds two\n", - "\t\t\tif count > 2:\n", - "\t\t\t\tcompressed_string.append(last_char)\n", - "\t\t\t\tcompressed_string.append(str(count))\n", - "\t\t\t\tcount = 1\n", - "\t\t\t\tlast_char = char\n", - "\t\t\t# If count is either 1 or 2 (or 0?)\n", - "\t\t\t# FIXME: CAN COUNT BE 0?\n", - "\t\t\telse:\n", - "\t\t\t\t# If count is 1, leave the char as is\n", - "\t\t\t\tif count == 1:\n", - "\t\t\t\t\tcompressed_string.append(last_char)\n", - "\t\t\t\t\tcount = 1\n", - "\t\t\t\t\tlast_char = char\n", - "\t\t\t\t# If count is 2, append the character twice\n", - "\t\t\t\telse:\n", - "\t\t\t\t\tcompressed_string.append(last_char)\n", - "\t\t\t\t\tcompressed_string.append(last_char)\n", - "\t\t\t\t\tcount = 1\n", - "\t\t\t\t\tlast_char = char\n", - "\tcompressed_string.append(last_char)\n", - "\tcompressed_string.append(str(count))\n", + " # Create compressed_string\n", + " compressed_string = list()\n", + " count = 0\n", + " last_char = string[0]\n", + " for char in string:\n", + " if char == last_char:\n", + " count += 1\n", + " else:\n", + " compressed_string.append(last_char)\n", + " compressed_string.append(str(count))\n", + " count = 1\n", + " last_char = char\n", + " compressed_string.append(last_char)\n", + " compressed_string.append(str(count))\n", "\n", - "\t# Convert the characters in the list to a string\n", - "\treturn \"\".join(compressed_string)" + " # Convert the characters in the list to a string\n", + " return \"\".join(compressed_string)" ] }, { @@ -172,7 +143,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 2, "metadata": { "collapsed": false }, @@ -196,8 +167,7 @@ " assert_equal(func(None), None)\n", " assert_equal(func(''), '')\n", " assert_equal(func('AABBCC'), 'AABBCC')\n", - " assert_equal(func('AAABCCDDDD'), 'A3BCCD4')\n", - " assert_equal(func('aaBCCEFFFFKKMMMMMMP taaammanlaarrrr seeeeeeeeek tooo'), 'aaBCCEF4KKM6P ta3mmanlaar4 se9k to3')\n", + " assert_equal(func('AAABCCDDDD'), 'A3B1C2D4')\n", " print('Success: test_compress')\n", "\n", "\n", @@ -212,7 +182,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 3, "metadata": { "collapsed": false }, @@ -228,34 +198,25 @@ "source": [ "%run -i test_compress.py" ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": { - "collapsed": true - }, - "outputs": [], - "source": [] } ], "metadata": { "kernelspec": { - "display_name": "Python 3", + "display_name": "Python 2", "language": "python", - "name": "python3" + "name": "python2" }, "language_info": { "codemirror_mode": { "name": "ipython", - "version": 3 + "version": 2 }, "file_extension": ".py", "mimetype": "text/x-python", "name": "python", "nbconvert_exporter": "python", - "pygments_lexer": "ipython3", - "version": "3.4.3" + "pygments_lexer": "ipython2", + "version": "2.7.10" } }, "nbformat": 4, diff --git a/arrays_strings/compress/test_compress.py b/arrays_strings/compress/test_compress.py index b15dde4..7ce5142 100644 --- a/arrays_strings/compress/test_compress.py +++ b/arrays_strings/compress/test_compress.py @@ -7,8 +7,7 @@ class TestCompress(object): assert_equal(func(None), None) assert_equal(func(''), '') assert_equal(func('AABBCC'), 'AABBCC') - assert_equal(func('AAABCCDDDD'), 'A3BCCD4') - assert_equal(func('aaBCCEFFFFKKMMMMMMP taaammanlaarrrr seeeeeeeeek tooo'), 'aaBCCEF4KKM6P ta3mmanlaar4 se9k to3') + assert_equal(func('AAABCCDDDD'), 'A3B1C2D4') print('Success: test_compress')