merging

istewart · Jan 24, 2019 · 17555ba · 17555ba
2 parents b445c5f + ac1afc5
commit 17555ba
Show file tree

Hide file tree

Showing 6 changed files with 1,636 additions and 1,193 deletions.
diff --git a/src/analysis/assimilation_comparison_ethnicity.ipynb b/src/analysis/assimilation_comparison_ethnicity.ipynb
@@ -12,8 +12,10 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
-   "metadata": {},
+   "execution_count": 1,
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "import pandas as pd\n",
@@ -34,7 +36,9 @@
   {
    "cell_type": "code",
    "execution_count": 151,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "def simplify_audience_output(data):\n",
@@ -71,7 +75,9 @@
   {
    "cell_type": "code",
    "execution_count": 275,
-   "metadata": {},
+   "metadata": {
+    "collapsed": false
+   },
    "outputs": [
     {
      "name": "stdout",
@@ -210,7 +216,9 @@
   {
    "cell_type": "code",
    "execution_count": 276,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "from collections import defaultdict\n",
@@ -243,7 +251,9 @@
   {
    "cell_type": "code",
    "execution_count": 277,
-   "metadata": {},
+   "metadata": {
+    "collapsed": false
+   },
    "outputs": [
     {
      "name": "stdout",
@@ -282,7 +292,9 @@
   {
    "cell_type": "code",
    "execution_count": 278,
-   "metadata": {},
+   "metadata": {
+    "collapsed": false
+   },
    "outputs": [
     {
      "data": {
@@ -424,7 +436,9 @@
   {
    "cell_type": "code",
    "execution_count": 279,
-   "metadata": {},
+   "metadata": {
+    "collapsed": false
+   },
    "outputs": [
     {
      "name": "stderr",
@@ -500,7 +514,9 @@
   {
    "cell_type": "code",
    "execution_count": 280,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "from scipy.stats import entropy\n",
@@ -529,7 +545,9 @@
   {
    "cell_type": "code",
    "execution_count": 281,
-   "metadata": {},
+   "metadata": {
+    "collapsed": false
+   },
    "outputs": [
     {
      "data": {
@@ -610,7 +628,9 @@
   {
    "cell_type": "code",
    "execution_count": 282,
-   "metadata": {},
+   "metadata": {
+    "collapsed": false
+   },
    "outputs": [
     {
      "data": {
@@ -637,7 +657,9 @@
   {
    "cell_type": "code",
    "execution_count": 283,
-   "metadata": {},
+   "metadata": {
+    "collapsed": false
+   },
    "outputs": [
     {
      "data": {
@@ -677,7 +699,9 @@
   {
    "cell_type": "code",
    "execution_count": 284,
-   "metadata": {},
+   "metadata": {
+    "collapsed": false
+   },
    "outputs": [
     {
      "data": {
@@ -724,7 +748,9 @@
   {
    "cell_type": "code",
    "execution_count": 285,
-   "metadata": {},
+   "metadata": {
+    "collapsed": false
+   },
    "outputs": [
     {
      "name": "stdout",
@@ -823,7 +849,9 @@
   {
    "cell_type": "code",
    "execution_count": 300,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "import numpy as np\n",
@@ -921,7 +949,9 @@
   {
    "cell_type": "code",
    "execution_count": 299,
-   "metadata": {},
+   "metadata": {
+    "collapsed": false
+   },
    "outputs": [
     {
      "name": "stdout",
@@ -991,7 +1021,9 @@
   {
    "cell_type": "code",
    "execution_count": 362,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "from itertools import izip\n",
@@ -1058,7 +1090,9 @@
   {
    "cell_type": "code",
    "execution_count": 363,
-   "metadata": {},
+   "metadata": {
+    "collapsed": false
+   },
    "outputs": [
     {
      "data": {
@@ -1121,7 +1155,9 @@
   {
    "cell_type": "code",
    "execution_count": 364,
-   "metadata": {},
+   "metadata": {
+    "collapsed": false
+   },
    "outputs": [
     {
      "data": {
@@ -1178,7 +1214,9 @@
   {
    "cell_type": "code",
    "execution_count": 1,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "def interest_comparison_test(source_data, expat_data, dest_data, \n",
@@ -1283,7 +1321,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython2",
-   "version": "2.7.15"
+   "version": "2.7.10"
   }
  },
  "nbformat": 4,