From 4be776e6aef6b347a2ee84820f5e658e517cf43a Mon Sep 17 00:00:00 2001 From: Neil Smith Date: Wed, 8 Mar 2017 05:26:09 -0800 Subject: [PATCH] Renamed 'sequence' to 'substring' --- .../generate_sequence.ipynb | 0 .../sequence000.txt | 0 .../sequence001.txt | 0 .../sequence002.txt | 0 .../sequence003.txt | 0 .../sequence004.txt | 0 .../sequence005.txt | 0 .../sequence006.txt | 0 .../sequence007.txt | 0 .../sequence008.txt | 0 .../sequence009.txt | 0 .../single_substring.ipynb | 48 +++++++------- .../single_substring_itertools.ipynb | 64 +++++++++---------- 13 files changed, 56 insertions(+), 56 deletions(-) rename {monotone-sequences => monotone-substrings}/generate_sequence.ipynb (100%) rename {monotone-sequences => monotone-substrings}/sequence000.txt (100%) rename {monotone-sequences => monotone-substrings}/sequence001.txt (100%) rename {monotone-sequences => monotone-substrings}/sequence002.txt (100%) rename {monotone-sequences => monotone-substrings}/sequence003.txt (100%) rename {monotone-sequences => monotone-substrings}/sequence004.txt (100%) rename {monotone-sequences => monotone-substrings}/sequence005.txt (100%) rename {monotone-sequences => monotone-substrings}/sequence006.txt (100%) rename {monotone-sequences => monotone-substrings}/sequence007.txt (100%) rename {monotone-sequences => monotone-substrings}/sequence008.txt (100%) rename {monotone-sequences => monotone-substrings}/sequence009.txt (100%) rename monotone-sequences/single_sequence.ipynb => monotone-substrings/single_substring.ipynb (99%) rename monotone-sequences/single_sequence-itertools.ipynb => monotone-substrings/single_substring_itertools.ipynb (89%) diff --git a/monotone-sequences/generate_sequence.ipynb b/monotone-substrings/generate_sequence.ipynb similarity index 100% rename from monotone-sequences/generate_sequence.ipynb rename to monotone-substrings/generate_sequence.ipynb diff --git a/monotone-sequences/sequence000.txt b/monotone-substrings/sequence000.txt similarity index 100% rename from monotone-sequences/sequence000.txt rename to monotone-substrings/sequence000.txt diff --git a/monotone-sequences/sequence001.txt b/monotone-substrings/sequence001.txt similarity index 100% rename from monotone-sequences/sequence001.txt rename to monotone-substrings/sequence001.txt diff --git a/monotone-sequences/sequence002.txt b/monotone-substrings/sequence002.txt similarity index 100% rename from monotone-sequences/sequence002.txt rename to monotone-substrings/sequence002.txt diff --git a/monotone-sequences/sequence003.txt b/monotone-substrings/sequence003.txt similarity index 100% rename from monotone-sequences/sequence003.txt rename to monotone-substrings/sequence003.txt diff --git a/monotone-sequences/sequence004.txt b/monotone-substrings/sequence004.txt similarity index 100% rename from monotone-sequences/sequence004.txt rename to monotone-substrings/sequence004.txt diff --git a/monotone-sequences/sequence005.txt b/monotone-substrings/sequence005.txt similarity index 100% rename from monotone-sequences/sequence005.txt rename to monotone-substrings/sequence005.txt diff --git a/monotone-sequences/sequence006.txt b/monotone-substrings/sequence006.txt similarity index 100% rename from monotone-sequences/sequence006.txt rename to monotone-substrings/sequence006.txt diff --git a/monotone-sequences/sequence007.txt b/monotone-substrings/sequence007.txt similarity index 100% rename from monotone-sequences/sequence007.txt rename to monotone-substrings/sequence007.txt diff --git a/monotone-sequences/sequence008.txt b/monotone-substrings/sequence008.txt similarity index 100% rename from monotone-sequences/sequence008.txt rename to monotone-substrings/sequence008.txt diff --git a/monotone-sequences/sequence009.txt b/monotone-substrings/sequence009.txt similarity index 100% rename from monotone-sequences/sequence009.txt rename to monotone-substrings/sequence009.txt diff --git a/monotone-sequences/single_sequence.ipynb b/monotone-substrings/single_substring.ipynb similarity index 99% rename from monotone-sequences/single_sequence.ipynb rename to monotone-substrings/single_substring.ipynb index cf68e1c..9fb7285 100644 --- a/monotone-sequences/single_sequence.ipynb +++ b/monotone-substrings/single_substring.ipynb @@ -2,15 +2,15 @@ "cells": [ { "cell_type": "code", - "execution_count": 95, + "execution_count": 1, "metadata": { "collapsed": false }, "outputs": [], "source": [ "def longest_monotone(seq, allow_same=False, debug=False):\n", - " \"\"\"Find the longest monotonic sequence. If allow_same is True, \n", - " instead find the longest non-decreasing or non-increasing sequence\"\"\"\n", + " \"\"\"Find the longest monotonic substring. If allow_same is True, \n", + " instead find the longest non-decreasing or non-increasing substring\"\"\"\n", " longest_length = 0\n", " current_length = 1\n", " current_same = 0\n", @@ -48,7 +48,7 @@ }, { "cell_type": "code", - "execution_count": 96, + "execution_count": 2, "metadata": { "collapsed": false }, @@ -72,7 +72,7 @@ "5" ] }, - "execution_count": 96, + "execution_count": 2, "metadata": {}, "output_type": "execute_result" } @@ -83,7 +83,7 @@ }, { "cell_type": "code", - "execution_count": 97, + "execution_count": 3, "metadata": { "collapsed": false }, @@ -108,7 +108,7 @@ "5" ] }, - "execution_count": 97, + "execution_count": 3, "metadata": {}, "output_type": "execute_result" } @@ -119,7 +119,7 @@ }, { "cell_type": "code", - "execution_count": 98, + "execution_count": 4, "metadata": { "collapsed": false }, @@ -147,7 +147,7 @@ "5" ] }, - "execution_count": 98, + "execution_count": 4, "metadata": {}, "output_type": "execute_result" } @@ -158,7 +158,7 @@ }, { "cell_type": "code", - "execution_count": 99, + "execution_count": 5, "metadata": { "collapsed": false }, @@ -186,7 +186,7 @@ "7" ] }, - "execution_count": 99, + "execution_count": 5, "metadata": {}, "output_type": "execute_result" } @@ -197,7 +197,7 @@ }, { "cell_type": "code", - "execution_count": 100, + "execution_count": 6, "metadata": { "collapsed": false }, @@ -225,7 +225,7 @@ "7" ] }, - "execution_count": 100, + "execution_count": 6, "metadata": {}, "output_type": "execute_result" } @@ -236,7 +236,7 @@ }, { "cell_type": "code", - "execution_count": 101, + "execution_count": 7, "metadata": { "collapsed": false }, @@ -270,7 +270,7 @@ "9" ] }, - "execution_count": 101, + "execution_count": 7, "metadata": {}, "output_type": "execute_result" } @@ -281,7 +281,7 @@ }, { "cell_type": "code", - "execution_count": 102, + "execution_count": 8, "metadata": { "collapsed": false }, @@ -315,7 +315,7 @@ "4" ] }, - "execution_count": 102, + "execution_count": 8, "metadata": {}, "output_type": "execute_result" } @@ -326,7 +326,7 @@ }, { "cell_type": "code", - "execution_count": 103, + "execution_count": 9, "metadata": { "collapsed": false }, @@ -10342,10 +10342,10 @@ "evalue": "'int' object is not iterable", "output_type": "error", "traceback": [ - "\u001b[1;31m---------------------------------------------------------------------------\u001b[0m", - "\u001b[1;31mTypeError\u001b[0m Traceback (most recent call last)", - "\u001b[1;32m\u001b[0m in \u001b[0;36m\u001b[1;34m()\u001b[0m\n\u001b[0;32m 3\u001b[0m \u001b[0msseq\u001b[0m \u001b[1;33m=\u001b[0m \u001b[0mf\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mread\u001b[0m\u001b[1;33m(\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m 4\u001b[0m \u001b[0mseq\u001b[0m \u001b[1;33m=\u001b[0m \u001b[1;33m[\u001b[0m\u001b[0mint\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0ms\u001b[0m\u001b[1;33m)\u001b[0m \u001b[1;32mfor\u001b[0m \u001b[0ms\u001b[0m \u001b[1;32min\u001b[0m \u001b[0msseq\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0msplit\u001b[0m\u001b[1;33m(\u001b[0m\u001b[1;34m','\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m]\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m----> 5\u001b[1;33m \u001b[0ms\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0ml\u001b[0m \u001b[1;33m=\u001b[0m \u001b[0mlongest_monotone\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mseq\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mdebug\u001b[0m\u001b[1;33m=\u001b[0m\u001b[1;32mTrue\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m 6\u001b[0m \u001b[0mprint\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mi\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0ms\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0ml\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n", - "\u001b[1;31mTypeError\u001b[0m: 'int' object is not iterable" + "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m", + "\u001b[0;31mTypeError\u001b[0m Traceback (most recent call last)", + "\u001b[0;32m\u001b[0m in \u001b[0;36m\u001b[0;34m()\u001b[0m\n\u001b[1;32m 3\u001b[0m \u001b[0msseq\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mf\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mread\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 4\u001b[0m \u001b[0mseq\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0;34m[\u001b[0m\u001b[0mint\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0ms\u001b[0m\u001b[0;34m)\u001b[0m \u001b[0;32mfor\u001b[0m \u001b[0ms\u001b[0m \u001b[0;32min\u001b[0m \u001b[0msseq\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0msplit\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m','\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m]\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 5\u001b[0;31m \u001b[0ms\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0ml\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mlongest_monotone\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mseq\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mdebug\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0;32mTrue\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m 6\u001b[0m \u001b[0mprint\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mi\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0ms\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0ml\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n", + "\u001b[0;31mTypeError\u001b[0m: 'int' object is not iterable" ] } ], @@ -10360,7 +10360,7 @@ }, { "cell_type": "code", - "execution_count": 105, + "execution_count": 10, "metadata": { "collapsed": false }, @@ -10450,7 +10450,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.5.2+" + "version": "3.5.2" } }, "nbformat": 4, diff --git a/monotone-sequences/single_sequence-itertools.ipynb b/monotone-substrings/single_substring_itertools.ipynb similarity index 89% rename from monotone-sequences/single_sequence-itertools.ipynb rename to monotone-substrings/single_substring_itertools.ipynb index 111b7be..80c2d2a 100644 --- a/monotone-sequences/single_sequence-itertools.ipynb +++ b/monotone-substrings/single_substring_itertools.ipynb @@ -2,7 +2,7 @@ "cells": [ { "cell_type": "code", - "execution_count": 2, + "execution_count": 1, "metadata": { "collapsed": true }, @@ -13,7 +13,7 @@ }, { "cell_type": "code", - "execution_count": 13, + "execution_count": 2, "metadata": { "collapsed": true }, @@ -30,15 +30,15 @@ }, { "cell_type": "code", - "execution_count": 110, + "execution_count": 3, "metadata": { "collapsed": false }, "outputs": [], "source": [ "def longest_monotone(seq, allow_same=False, debug=False):\n", - " \"\"\"Find the longest monotonic sequence. If allow_same is True, \n", - " instead find the longest non-decreasing or non-increasing sequence\"\"\"\n", + " \"\"\"Find the longest monotonic substring. If allow_same is True, \n", + " instead find the longest non-decreasing or non-increasing substring\"\"\"\n", " cmps = [cmp(x, y) for x, y in zip(seq, seq[1:])]\n", " groups = [(k, len(list(g)) + 1) for k, g in itertools.groupby(cmps)]\n", " if allow_same:\n", @@ -51,7 +51,7 @@ }, { "cell_type": "code", - "execution_count": 85, + "execution_count": 4, "metadata": { "collapsed": true }, @@ -80,7 +80,7 @@ }, { "cell_type": "code", - "execution_count": 111, + "execution_count": 5, "metadata": { "collapsed": false }, @@ -91,7 +91,7 @@ "5" ] }, - "execution_count": 111, + "execution_count": 5, "metadata": {}, "output_type": "execute_result" } @@ -102,7 +102,7 @@ }, { "cell_type": "code", - "execution_count": 112, + "execution_count": 6, "metadata": { "collapsed": false }, @@ -113,7 +113,7 @@ "(5, [(1, 5), (-1, 2), (1, 3)])" ] }, - "execution_count": 112, + "execution_count": 6, "metadata": {}, "output_type": "execute_result" } @@ -124,7 +124,7 @@ }, { "cell_type": "code", - "execution_count": 102, + "execution_count": 7, "metadata": { "collapsed": false }, @@ -135,7 +135,7 @@ "5" ] }, - "execution_count": 102, + "execution_count": 7, "metadata": {}, "output_type": "execute_result" } @@ -146,7 +146,7 @@ }, { "cell_type": "code", - "execution_count": 103, + "execution_count": 8, "metadata": { "collapsed": false }, @@ -157,7 +157,7 @@ "5" ] }, - "execution_count": 103, + "execution_count": 8, "metadata": {}, "output_type": "execute_result" } @@ -168,7 +168,7 @@ }, { "cell_type": "code", - "execution_count": 104, + "execution_count": 9, "metadata": { "collapsed": false }, @@ -179,7 +179,7 @@ "7" ] }, - "execution_count": 104, + "execution_count": 9, "metadata": {}, "output_type": "execute_result" } @@ -190,7 +190,7 @@ }, { "cell_type": "code", - "execution_count": 105, + "execution_count": 10, "metadata": { "collapsed": false }, @@ -201,7 +201,7 @@ "5" ] }, - "execution_count": 105, + "execution_count": 10, "metadata": {}, "output_type": "execute_result" } @@ -212,7 +212,7 @@ }, { "cell_type": "code", - "execution_count": 106, + "execution_count": 11, "metadata": { "collapsed": false }, @@ -223,7 +223,7 @@ "7" ] }, - "execution_count": 106, + "execution_count": 11, "metadata": {}, "output_type": "execute_result" } @@ -234,7 +234,7 @@ }, { "cell_type": "code", - "execution_count": 107, + "execution_count": 12, "metadata": { "collapsed": false }, @@ -245,7 +245,7 @@ "7" ] }, - "execution_count": 107, + "execution_count": 12, "metadata": {}, "output_type": "execute_result" } @@ -256,7 +256,7 @@ }, { "cell_type": "code", - "execution_count": 108, + "execution_count": 13, "metadata": { "collapsed": false }, @@ -267,7 +267,7 @@ "9" ] }, - "execution_count": 108, + "execution_count": 13, "metadata": {}, "output_type": "execute_result" } @@ -278,7 +278,7 @@ }, { "cell_type": "code", - "execution_count": 109, + "execution_count": 14, "metadata": { "collapsed": false }, @@ -289,7 +289,7 @@ "7" ] }, - "execution_count": 109, + "execution_count": 14, "metadata": {}, "output_type": "execute_result" } @@ -300,7 +300,7 @@ }, { "cell_type": "code", - "execution_count": 113, + "execution_count": 15, "metadata": { "collapsed": false }, @@ -311,7 +311,7 @@ "10" ] }, - "execution_count": 113, + "execution_count": 15, "metadata": {}, "output_type": "execute_result" } @@ -322,7 +322,7 @@ }, { "cell_type": "code", - "execution_count": 114, + "execution_count": 16, "metadata": { "collapsed": false }, @@ -346,7 +346,7 @@ }, { "cell_type": "code", - "execution_count": 115, + "execution_count": 17, "metadata": { "collapsed": false }, @@ -379,7 +379,7 @@ }, { "cell_type": "code", - "execution_count": 116, + "execution_count": 18, "metadata": { "collapsed": false }, @@ -436,7 +436,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.5.2+" + "version": "3.5.2" } }, "nbformat": 4, -- 2.34.1