diff --git a/tests/creator/creator.ipynb b/tests/creator/creator.ipynb index 51895942..1cdc5041 100644 --- a/tests/creator/creator.ipynb +++ b/tests/creator/creator.ipynb @@ -2678,7 +2678,11 @@ }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 48, +======= + "execution_count": 8, +>>>>>>> Stashed changes "metadata": {}, "outputs": [], "source": [ @@ -2691,7 +2695,11 @@ }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 49, +======= + "execution_count": 9, +>>>>>>> Stashed changes "metadata": {}, "outputs": [], "source": [ @@ -64342,7 +64350,11 @@ }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 50, +======= + "execution_count": 46, +>>>>>>> Stashed changes "metadata": {}, "outputs": [ { @@ -64373,14 +64385,22 @@ }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 51, +======= + "execution_count": 47, +>>>>>>> Stashed changes "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "Creating file ../test_df_cols.py\n", +======= + "Creating file ../test_df_distance_cluster.py\n", +>>>>>>> Stashed changes "Done\n" ] } @@ -82686,10 +82706,74 @@ }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 93, "metadata": {}, "outputs": [ { +======= + "execution_count": 19, + "metadata": {}, + "outputs": [], + "source": [ + "t = Test(op, source_df, \"df_outliers\", imports=[\"from pyspark.ml.linalg import Vectors, VectorUDT, DenseVector\",\n", + " \"import numpy as np\",\n", + " \"nan = np.nan\",\n", + " \"import datetime\",\n", + " \"from pyspark.sql import functions as F\"], path = \"df_outliers\", final_path=\"..\")" + ] + }, + { + "cell_type": "code", + "execution_count": 20, + "metadata": {}, + "outputs": [], + "source": [ + "from pyspark.sql import functions as F\n", + "\n", + "\n", + "def func(col_name, attrs):\n", + " return F.col(col_name) * 2\n", + "\n", + "numeric_col = \"height(ft)\"\n", + "numeric_col_B = \"rank\"\n", + "numeric_col_C = \"rank\"\n", + "string_col = \"function\"\n", + "date_col = \"date arrival\"\n", + "date_col_B = \"last date seen\"\n", + "new_col = \"new col\"\n", + "array_col = \"attributes\"" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## Tukey" + ] + }, + { + "cell_type": "code", + "execution_count": 14, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Creating test_outliers_tukey_select() test function...\n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "INFO:optimus:test_outliers_tukey_select()\n", + "INFO:optimus:percentile() executed in 2.59 sec\n" + ] + }, + { +>>>>>>> Stashed changes "data": { "text/html": [ "\n", @@ -82697,7 +82781,11 @@ "\n", "\n", "\n", +<<<<<<< Updated upstream "
\n",
+<<<<<<< Updated upstream
" \n",
" \n",
" Optim'us\n",
" \n",
+=======
+ " Optim'us\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" -28\n",
" \n",
+=======
+ " -28\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" Leader\n",
" \n",
+=======
+ " Leader\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 10\n",
" \n",
+=======
+ " 10\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 5000000\n",
" \n",
+=======
+ " 5000000\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 4.300000190734863\n",
" \n",
+=======
+ " 4.300000190734863\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" ['Inochi',⋅'Convoy']\n",
" \n",
+=======
+ " ['Inochi',⋅'Convoy']\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 19.442735,-99.201111\n",
" \n",
+=======
+ " 19.442735,-99.201111\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 1980/04/10\n",
" \n",
+=======
+ " 1980/04/10\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 2016/09/10\n",
" \n",
+=======
+ " 2016/09/10\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" [8.53439998626709,⋅4300.0]\n",
" \n",
+=======
+ " [8.53439998626709,⋅4300.0]\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 2016-09-10\n",
" \n",
+=======
+ " 2016-09-10\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 2014-06-24⋅00:00:00\n",
" \n",
+=======
+ " 2014-06-24⋅00:00:00\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" True\n",
" \n",
+=======
+ " True\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" bytearray(b'Leader')\n",
" \n",
+=======
+ " bytearray(b'Leader')\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" None\n",
" \n",
+=======
+ " None\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
@@ -83004,135 +83156,200 @@
"
\n",
+<<<<<<< Updated upstream
" \n",
" \n",
" bumbl#ebéé⋅⋅\n",
" \n",
+=======
+ " Metroplex_)^$\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 17\n",
" \n",
+=======
+ " 300\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" Espionage\n",
" \n",
+=======
+ " Battle⋅Station\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 7\n",
" \n",
+=======
+ " 8\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 5000000\n",
" \n",
+=======
+ " 5000000\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 2.0\n",
" \n",
+=======
+ " None\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" ['Bumble',⋅'Goldback']\n",
" \n",
+=======
+ " ['Metroflex']\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 10.642707,-71.612534\n",
" \n",
+=======
+ " None\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 1980/04/10\n",
" \n",
+=======
+ " 1980/04/10\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 2015/08/10\n",
" \n",
+=======
+ " 2011/04/10\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" [5.334000110626221,⋅2000.0]\n",
" \n",
+=======
+ " [91.44000244140625,⋅None]\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 2015-08-10\n",
" \n",
+=======
+ " 2011-04-10\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 2014-06-24⋅00:00:00\n",
" \n",
+=======
+ " 2014-06-24⋅00:00:00\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" True\n",
" \n",
+=======
+ " True\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" bytearray(b'Espionage')\n",
" \n",
+=======
+ " bytearray(b'Battle⋅Station')\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" None\n",
" \n",
+=======
+ " None\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
"
\n", @@ -83264,66 +83481,315 @@ " | \n", " \n", "
\n",
+ " names \n",
+ " 1 (string) \n",
+ " \n",
+ " \n",
+ " nullable\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " \n",
+ " height(ft) \n",
+ " 2 (smallint) \n",
+ " \n",
+ " \n",
+ " nullable\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " \n",
+ " function \n",
+ " 3 (string) \n",
+ " \n",
+ " \n",
+ " nullable\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " \n",
+ " rank \n",
+ " 4 (tinyint) \n",
+ " \n",
+ " \n",
+ " nullable\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " \n",
+ " age \n",
+ " 5 (int) \n",
+ " \n",
+ " \n",
+ " nullable\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " \n",
+ " weight(t) \n",
+ " 6 (float) \n",
+ " \n",
+ " \n",
+ " nullable\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " \n",
+ " japanese name \n",
+ " 7 (array<string>) \n",
+ " \n",
+ " \n",
+ " nullable\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " \n",
+ " last position seen \n",
+ " 8 (string) \n",
+ " \n",
+ " \n",
+ " nullable\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " \n",
+ " date arrival \n",
+ " 9 (string) \n",
+ " \n",
+ " \n",
+ " nullable\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " \n",
+ " last date seen \n",
+ " 10 (string) \n",
+ " \n",
+ " \n",
+ " nullable\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " \n",
+ " attributes \n",
+ " 11 (array<float>) \n",
+ " \n",
+ " \n",
+ " nullable\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " \n",
+ " Date Type \n",
+ " 12 (date) \n",
+ " \n",
+ " \n",
+ " nullable\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " \n",
+ " timestamp \n",
+ " 13 (timestamp) \n",
+ " \n",
+ " \n",
+ " nullable\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " \n",
+ " Cybertronian \n",
+ " 14 (boolean) \n",
+ " \n",
+ " \n",
+ " nullable\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " \n",
+ " function(binary) \n",
+ " 15 (binary) \n",
+ " \n",
+ " \n",
+ " nullable\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " \n",
+ " NullType \n",
+ " 16 (null) \n",
+ " \n",
+ " \n",
+ " nullable\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ "
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
\n",
+<<<<<<< Updated upstream
" \n",
" \n",
" Jazz\n",
" \n",
+=======
+ " bumbl#ebéé⋅⋅\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 13\n",
" \n",
+=======
+ " 17\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" First⋅Lieutenant\n",
" \n",
+=======
+ " Espionage\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 8\n",
" \n",
+=======
+ " 7\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 5000000\n",
" \n",
+=======
+ " 5000000\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 1.7999999523162842\n",
" \n",
+=======
+ " 2.0\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" ['Meister']\n",
" \n",
+=======
+ " ['Bumble',⋅'Goldback']\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 33.670666,-117.841553\n",
@@ -83460,70 +83926,105 @@
" \n",
" None\n",
" \n",
+=======
+ " 10.642707,-71.612534\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 1980/04/10\n",
" \n",
+=======
+ " 1980/04/10\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 2012/05/10\n",
" \n",
+=======
+ " 2015/08/10\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" [None,⋅5700.0]\n",
" \n",
+=======
+ " [5.334000110626221,⋅2000.0]\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 2012-05-10\n",
" \n",
+=======
+ " 2015-08-10\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 2014-06-24⋅00:00:00\n",
" \n",
+=======
+ " 2014-06-24⋅00:00:00\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" True\n",
" \n",
+=======
+ " True\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" bytearray(b'None')\n",
" \n",
+=======
+ " bytearray(b'Espionage')\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" None\n",
" \n",
+=======
+ " None\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
@@ -83532,130 +84033,194 @@
"
\n",
+<<<<<<< Updated upstream
" \n",
" \n",
" Metroplex_)^$\n",
" \n",
+=======
+ " ironhide&\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 300\n",
" \n",
+=======
+ " 26\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" Battle⋅Station\n",
" \n",
+=======
+ " Security\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 8\n",
" \n",
+=======
+ " 7\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 5000000\n",
" \n",
+=======
+ " 5000000\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" None\n",
" \n",
+=======
+ " 4.0\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" ['Metroflex']\n",
" \n",
+=======
+ " ['Roadbuster']\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" None\n",
" \n",
+=======
+ " 37.789563,-122.400356\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 1980/04/10\n",
" \n",
+=======
+ " 1980/04/10\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 2011/04/10\n",
" \n",
+=======
+ " 2014/07/10\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" [91.44000244140625,⋅None]\n",
" \n",
+=======
+ " [7.924799919128418,⋅4000.0]\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 2011-04-10\n",
" \n",
+=======
+ " 2014-06-24\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 2014-06-24⋅00:00:00\n",
" \n",
+=======
+ " 2014-06-24⋅00:00:00\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" True\n",
" \n",
+=======
+ " True\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" bytearray(b'Battle⋅Station')\n",
" \n",
+=======
+ " bytearray(b'Security')\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" None\n",
" \n",
+=======
+ " None\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
@@ -83664,130 +84229,194 @@
"
\n",
+<<<<<<< Updated upstream
" \n",
" \n",
" None\n",
" \n",
+=======
+ " Jazz\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" None\n",
" \n",
+=======
+ " 13\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" None\n",
" \n",
+=======
+ " First⋅Lieutenant\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" None\n",
" \n",
+=======
+ " 8\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" None\n",
" \n",
+=======
+ " 5000000\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" None\n",
" \n",
+=======
+ " 1.7999999523162842\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" None\n",
" \n",
+=======
+ " ['Meister']\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" None\n",
" \n",
+=======
+ " 33.670666,-117.841553\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" None\n",
" \n",
+=======
+ " 1980/04/10\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" None\n",
" \n",
+=======
+ " 2013/06/10\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" None\n",
" \n",
+=======
+ " [3.962399959564209,⋅1800.0]\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" None\n",
" \n",
+=======
+ " 2013-06-24\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" None\n",
" \n",
+=======
+ " 2014-06-24⋅00:00:00\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" None\n",
" \n",
+=======
+ " True\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" None\n",
" \n",
+=======
+ " bytearray(b'First⋅Lieutenant')\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" None\n",
" \n",
+=======
+ " None\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
@@ -83797,7 +84426,11 @@
"
\n",
+ " names \n",
+ " 1 (string) \n",
+ " \n",
+ " \n",
+ " nullable\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " \n",
+ " height(ft) \n",
+>>>>>>> Stashed changes
" 2 (smallint) \n",
" \n",
" \n",
@@ -84104,130 +84943,194 @@
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" Optim'us\n",
" \n",
+=======
+ " Optim'us\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" -28\n",
" \n",
+=======
+ " -28\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" Leader\n",
" \n",
+=======
+ " Leader\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" 10\n",
" \n",
+=======
+ " 10\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" 5000000\n",
" \n",
+=======
+ " 5000000\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" 4.300000190734863\n",
" \n",
+=======
+ " 4.300000190734863\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" ['Inochi',⋅'Convoy']\n",
" \n",
+=======
+ " ['Inochi',⋅'Convoy']\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" 19.442735,-99.201111\n",
" \n",
+=======
+ " 19.442735,-99.201111\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" 1980/04/10\n",
" \n",
+=======
+ " 1980/04/10\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" 2016/09/10\n",
" \n",
+=======
+ " 2016/09/10\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" [8.53439998626709,⋅4300.0]\n",
" \n",
+=======
+ " [8.53439998626709,⋅4300.0]\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" 2016-09-10\n",
" \n",
+=======
+ " 2016-09-10\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" 2014-06-24⋅00:00:00\n",
" \n",
+=======
+ " 2014-06-24⋅00:00:00\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" True\n",
" \n",
+=======
+ " True\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" bytearray(b'Leader')\n",
" \n",
+=======
+ " bytearray(b'Leader')\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
@@ -84236,130 +85139,194 @@
" \n",
" \n",
" None\n",
" \n",
+=======
+ " None\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" Metroplex_)^$\n",
" \n",
+=======
+ " Metroplex_)^$\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" 300\n",
" \n",
+=======
+ " 300\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" Battle⋅Station\n",
" \n",
+=======
+ " Battle⋅Station\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" 8\n",
" \n",
+=======
+ " 8\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" 5000000\n",
" \n",
+=======
+ " 5000000\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" None\n",
" \n",
+=======
+ " None\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" ['Metroflex']\n",
" \n",
+=======
+ " ['Metroflex']\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" None\n",
" \n",
+=======
+ " None\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" 1980/04/10\n",
" \n",
+=======
+ " 1980/04/10\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" 2011/04/10\n",
" \n",
+=======
+ " 2011/04/10\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" [91.44000244140625,⋅None]\n",
" \n",
+=======
+ " [91.44000244140625,⋅None]\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" 2011-04-10\n",
" \n",
+=======
+ " 2011-04-10\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" 2014-06-24⋅00:00:00\n",
" \n",
+=======
+ " 2014-06-24⋅00:00:00\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" True\n",
" \n",
+=======
+ " True\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
" \n",
" \n",
" bytearray(b'Battle⋅Station')\n",
" \n",
+=======
+ " bytearray(b'Battle⋅Station')\n",
+>>>>>>> Stashed changes
" \n",
" \n",
+<<<<<<< Updated upstream
" | \n",
" \n",
@@ -84381,19 +85348,31 @@
}
],
"source": [
+<<<<<<< Updated upstream
"t.create(None, \"outliers.tukey\", None, \"df\",\"select\", numeric_col)"
+=======
+ "t.create(None, \"outliers.z_score\", None, \"df\",\"select\", numeric_col, threshold)"
+>>>>>>> Stashed changes
]
},
{
"cell_type": "code",
+<<<<<<< Updated upstream
"execution_count": 97,
+=======
+ "execution_count": 23,
+>>>>>>> Stashed changes
"metadata": {},
"outputs": [
{
"name": "stderr",
"output_type": "stream",
"text": [
+<<<<<<< Updated upstream
"INFO:optimus:percentile() executed in 3.36 sec\n"
+=======
+ "INFO:optimus:Using 'column_exp' to process column 'height(ft)' with function _z_score\n"
+>>>>>>> Stashed changes
]
},
{
@@ -84402,33 +85381,54 @@
"DataFrame[names: string, height(ft): smallint, function: string, rank: tinyint, age: int, weight(t): float, japanese name: array\n",
" \n",
" None\n",
" \n",
+=======
+ " None\n",
+>>>>>>> Stashed changes
" \n",
" Viewing 0 of 0 rows / 16 columns \n",
+=======
+ "Viewing 3 of 3 rows / 16 columns \n",
+>>>>>>> Stashed changes
"1 partition(s) \n",
"\n",
"
Viewing 0 of 0 rows / 16 columns \n",
+=======
+ "Viewing 3 of 3 rows / 16 columns \n",
+>>>>>>> Stashed changes
"1 partition(s) \n"
],
"text/plain": [
@@ -84627,6 +85890,7 @@
}
],
"source": [
+<<<<<<< Updated upstream
"t.create(None, \"outliers.tukey\", None, \"df\",\"drop\", numeric_col)"
]
},
@@ -84661,107 +85925,179 @@
],
"source": [
"t.create(None, \"outliers.tukey\", None, \"json\", \"whiskers\", numeric_col)"
+=======
+ "t.create(None, \"outliers.z_score\", None, \"df\",\"drop\", numeric_col, threshold)"
+>>>>>>> Stashed changes
]
},
{
"cell_type": "code",
+<<<<<<< Updated upstream
"execution_count": 29,
+=======
+ "execution_count": 25,
+>>>>>>> Stashed changes
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
+<<<<<<< Updated upstream
"Creating test_outliers_tukey_count() test function...\n"
+=======
+ "Creating test_outliers_z_score_count() test function...\n"
+>>>>>>> Stashed changes
]
},
{
"name": "stderr",
"output_type": "stream",
"text": [
+<<<<<<< Updated upstream
"INFO:optimus:test_outliers_tukey_count()\n",
"INFO:optimus:percentile() executed in 2.59 sec\n"
+=======
+ "INFO:optimus:test_outliers_z_score_count()\n",
+ "INFO:optimus:Using 'column_exp' to process column 'height(ft)' with function _z_score\n"
+>>>>>>> Stashed changes
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
+<<<<<<< Updated upstream
"5\n"
+=======
+ "2\n"
+>>>>>>> Stashed changes
]
}
],
"source": [
+<<<<<<< Updated upstream
"t.create(None, \"outliers.tukey\", None, \"json\", \"count\", numeric_col)"
+=======
+ "t.create(None, \"outliers.z_score\", None, \"json\", \"count\", numeric_col, threshold)"
+>>>>>>> Stashed changes
]
},
{
"cell_type": "code",
+<<<<<<< Updated upstream
"execution_count": 30,
+=======
+ "execution_count": 26,
+>>>>>>> Stashed changes
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
+<<<<<<< Updated upstream
"Creating test_outliers_tukey_non_outliers_count() test function...\n"
+=======
+ "Creating test_outliers_z_score_non_outliers_count() test function...\n"
+>>>>>>> Stashed changes
]
},
{
"name": "stderr",
"output_type": "stream",
"text": [
+<<<<<<< Updated upstream
"INFO:optimus:test_outliers_tukey_non_outliers_count()\n",
"INFO:optimus:percentile() executed in 2.61 sec\n"
+=======
+ "INFO:optimus:test_outliers_z_score_non_outliers_count()\n",
+ "INFO:optimus:Using 'column_exp' to process column 'height(ft)' with function _z_score\n"
+>>>>>>> Stashed changes
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
+<<<<<<< Updated upstream
"2\n"
+=======
+ "3\n"
+>>>>>>> Stashed changes
]
}
],
"source": [
+<<<<<<< Updated upstream
"t.create(None, \"outliers.tukey\", None, \"json\", \"non_outliers_count\", numeric_col)"
+=======
+ "t.create(None, \"outliers.z_score\", None, \"json\", \"non_outliers_count\", numeric_col, threshold)"
+>>>>>>> Stashed changes
]
},
{
"cell_type": "code",
+<<<<<<< Updated upstream
"execution_count": 31,
+=======
+ "execution_count": 27,
+>>>>>>> Stashed changes
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
+<<<<<<< Updated upstream
"Creating test_outliers_tukey_info() test function...\n"
+=======
+ "Creating test_outliers_z_score_info() test function...\n"
+>>>>>>> Stashed changes
]
},
{
"name": "stderr",
"output_type": "stream",
"text": [
+<<<<<<< Updated upstream
"INFO:optimus:test_outliers_tukey_info()\n",
"INFO:optimus:percentile() executed in 2.62 sec\n"
+=======
+ "INFO:optimus:test_outliers_z_score_info()\n",
+ "INFO:optimus:Using 'column_exp' to process column 'height(ft)' with function _z_score\n",
+ "INFO:optimus:Using 'column_exp' to process column 'height(ft)' with function _z_score\n",
+ "INFO:optimus:Using 'column_exp' to process column 'height(ft)' with function _z_score\n"
+>>>>>>> Stashed changes
]
},
{
"name": "stdout",
"output_type": "stream",
"text": [
+<<<<<<< Updated upstream
"{'count_outliers': 5, 'count_non_outliers': 2, 'lower_bound': 45.5, 'lower_bound_count': 4, 'upper_bound': -6.5, 'upper_bound_count': 4, 'q1': 13, 'median': 17, 'q3': 26, 'iqr': 13}\n"
+=======
+ "{'count_outliers': 2, 'count_non_outliers': 3, 'max_z_score': 1.76684}\n"
+>>>>>>> Stashed changes
]
}
],
"source": [
+<<<<<<< Updated upstream
"t.create(None, \"outliers.tukey\", None, \"json\", \"info\", numeric_col)"
+=======
+ "t.create(None, \"outliers.z_score\", None, \"json\", \"info\", numeric_col, threshold)"
+>>>>>>> Stashed changes
]
},
{
"cell_type": "code",
+<<<<<<< Updated upstream
"execution_count": 32,
+=======
+ "execution_count": 28,
+>>>>>>> Stashed changes
"metadata": {},
"outputs": [
{
@@ -84781,36 +86117,61 @@
"cell_type": "markdown",
"metadata": {},
"source": [
+<<<<<<< Updated upstream
"## Zscore"
+=======
+ "## Modified Zscore"
+>>>>>>> Stashed changes
]
},
{
"cell_type": "code",
+<<<<<<< Updated upstream
"execution_count": 10,
"metadata": {},
"outputs": [],
"source": [
"threshold = 0.5"
+=======
+ "execution_count": 34,
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "threshold = 0.5\n",
+ "relative_error = 10000"
+>>>>>>> Stashed changes
]
},
{
"cell_type": "code",
+<<<<<<< Updated upstream
"execution_count": 12,
+=======
+ "execution_count": 35,
+>>>>>>> Stashed changes
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
+<<<<<<< Updated upstream
"Creating test_outliers_z_score_select() test function...\n"
+=======
+ "Creating test_outliers_modified_z_score_select() test function...\n"
+>>>>>>> Stashed changes
]
},
{
"name": "stderr",
"output_type": "stream",
"text": [
+<<<<<<< Updated upstream
"INFO:optimus:test_outliers_z_score_select()\n",
"INFO:optimus:Using 'column_exp' to process column 'height(ft)' with function _z_score\n"
+=======
+ "INFO:optimus:test_outliers_modified_z_score_select()\n"
+>>>>>>> Stashed changes
]
},
{
@@ -84821,7 +86182,11 @@
"\n",
"\n",
"\n",
+<<<<<<< Updated upstream
"Viewing 2 of 2 rows / 16 columns \n",
+=======
+ "Viewing 3 of 3 rows / 16 columns \n",
+>>>>>>> Stashed changes
"1 partition(s) \n",
"\n",
"
\n",
+ " | \n",
+ " \n",
+ " Metroplex_)^$\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " 300\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " Battle⋅Station\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " 8\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " 5000000\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " None\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " ['Metroflex']\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " None\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " 1980/04/10\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " 2011/04/10\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " [91.44000244140625,⋅None]\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " 2011-04-10\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " 2014-06-24⋅00:00:00\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " True\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " bytearray(b'Battle⋅Station')\n",
+ " \n",
+ " \n",
+ " | \n",
+ " \n",
+ " None\n",
+ " \n",
+ " |
---|
\n",
+<<<<<<< Updated upstream
" \n",
" \n",
" bumbl#ebéé⋅⋅\n",
@@ -85642,126 +87256,189 @@
" \n",
" ironhide&\n",
" \n",
+=======
+ " bumbl#ebéé⋅⋅\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 26\n",
" \n",
+=======
+ " 17\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" Security\n",
" \n",
+=======
+ " Espionage\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 7\n",
" \n",
+=======
+ " 7\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 5000000\n",
" \n",
+=======
+ " 5000000\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 4.0\n",
" \n",
+=======
+ " 2.0\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" ['Roadbuster']\n",
" \n",
+=======
+ " ['Bumble',⋅'Goldback']\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 37.789563,-122.400356\n",
" \n",
+=======
+ " 10.642707,-71.612534\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 1980/04/10\n",
" \n",
+=======
+ " 1980/04/10\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 2014/07/10\n",
" \n",
+=======
+ " 2015/08/10\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" [7.924799919128418,⋅4000.0]\n",
" \n",
+=======
+ " [5.334000110626221,⋅2000.0]\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 2014-06-24\n",
" \n",
+=======
+ " 2015-08-10\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 2014-06-24⋅00:00:00\n",
" \n",
+=======
+ " 2014-06-24⋅00:00:00\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" True\n",
" \n",
+=======
+ " True\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" bytearray(b'Security')\n",
" \n",
+=======
+ " bytearray(b'Espionage')\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" None\n",
" \n",
+=======
+ " None\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
@@ -85770,130 +87447,194 @@
"
\n",
+<<<<<<< Updated upstream
" \n",
" \n",
" Jazz\n",
" \n",
+=======
+ " Jazz\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 13\n",
" \n",
+=======
+ " 13\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" First⋅Lieutenant\n",
" \n",
+=======
+ " First⋅Lieutenant\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 8\n",
" \n",
+=======
+ " 8\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 5000000\n",
" \n",
+=======
+ " 5000000\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 1.7999999523162842\n",
" \n",
+=======
+ " 1.7999999523162842\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" ['Meister']\n",
" \n",
+=======
+ " ['Meister']\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 33.670666,-117.841553\n",
" \n",
+=======
+ " 33.670666,-117.841553\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 1980/04/10\n",
" \n",
+=======
+ " 1980/04/10\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 2013/06/10\n",
" \n",
+=======
+ " 2013/06/10\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" [3.962399959564209,⋅1800.0]\n",
" \n",
+=======
+ " [3.962399959564209,⋅1800.0]\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 2013-06-24\n",
" \n",
+=======
+ " 2013-06-24\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" 2014-06-24⋅00:00:00\n",
" \n",
+=======
+ " 2014-06-24⋅00:00:00\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" True\n",
" \n",
+=======
+ " True\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" bytearray(b'First⋅Lieutenant')\n",
" \n",
+=======
+ " bytearray(b'First⋅Lieutenant')\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" \n",
" None\n",
" \n",
+=======
+ " None\n",
+>>>>>>> Stashed changes
" \n",
" | \n",
" \n",
@@ -85903,7 +87644,11 @@
"
\n",
+ " LOCNCODE \n",
+ " 1 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" | \n",
" \n",
+<<<<<<< Updated upstream
" \n",
" height(ft) \n",
" 2 (smallint) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" LOCNDSCR \n",
+ " 2 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | function \n",
" 3 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" ADDRESS1 \n",
+ " 3 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | rank \n",
" 4 (tinyint) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" ADDRESS2 \n",
+ " 4 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | age \n",
" 5 (int) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" ADDRESS3 \n",
+ " 5 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | weight(t) \n",
" 6 (float) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" CITY \n",
+ " 6 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | japanese name \n",
" 7 (array<string>) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" STATE \n",
+ " 7 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | last position seen \n",
" 8 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" ZIPCODE \n",
+ " 8 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | date arrival \n",
" 9 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" COUNTRY \n",
+ " 9 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | last date seen \n",
" 10 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" Location_Segment \n",
+ " 10 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | attributes \n",
" 11 (array<float>) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" PAQ \n",
+ " 11 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | Date Type \n",
" 12 (date) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" TIPUNI \n",
+ " 12 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | timestamp \n",
" 13 (timestamp) \n",
@@ -101004,1246 +103375,2120 @@
" Tipo_unidad \n",
" 13 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" Tipo_unidad \n",
+ " 13 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | ITEMNMBR \n",
" 14 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" ITEMNMBR \n",
+ " 14 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | ITMSHNAM \n",
" 15 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" ITMSHNAM \n",
+ " 15 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | MZ \n",
" 16 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" MZ \n",
+ " 16 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | LT \n",
" 17 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" LT \n",
+ " 17 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | EDIF \n",
" 18 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" EDIF \n",
+ " 18 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | NIVEL \n",
" 19 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" NIVEL \n",
+ " 19 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | NOUNI \n",
" 20 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" NOUNI \n",
+ " 20 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | CONDO \n",
" 21 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" CONDO \n",
+ " 21 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | REGIMEN \n",
" 22 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" REGIMEN \n",
+ " 22 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | ETAPA \n",
" 23 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" ETAPA \n",
+ " 23 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | PROTO \n",
" 24 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" PROTO \n",
+ " 24 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | ITEMDESC \n",
" 25 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" ITEMDESC \n",
+ " 25 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | NIVELES \n",
" 26 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" NIVELES \n",
+ " 26 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | COCHERA \n",
" 27 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" COCHERA \n",
+ " 27 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | RECAM \n",
" 28 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" RECAM \n",
+ " 28 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | ALCOB \n",
" 29 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" ALCOB \n",
+ " 29 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | BANOS \n",
" 30 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" BANOS \n",
+ " 30 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | Num_Balcon \n",
" 31 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" Num_Balcon \n",
+ " 31 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | SALA \n",
" 32 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" SALA \n",
+ " 32 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | COMEDOR \n",
" 33 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" COMEDOR \n",
+ " 33 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | COCINA \n",
" 34 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" COCINA \n",
+ " 34 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | Cuarto_Lavado \n",
" 35 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" Cuarto_Lavado \n",
+ " 35 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | Cuarto_Servicio \n",
" 36 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" Cuarto_Servicio \n",
+ " 36 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | OTROX \n",
" 37 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" OTROX \n",
+ " 37 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | OTROX1 \n",
" 38 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" OTROX1 \n",
+ " 38 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | SupCons \n",
" 39 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" SupCons \n",
+ " 39 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | PATIOSERV \n",
" 40 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" PATIOSERV \n",
+ " 40 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | TERRAZA \n",
" 41 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" TERRAZA \n",
+ " 41 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | BALCON \n",
" 42 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" BALCON \n",
+ " 42 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | AZOTEA \n",
" 43 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" AZOTEA \n",
+ " 43 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | Otros \n",
" 44 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" Otros \n",
+ " 44 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | AREATOT \n",
" 45 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" AREATOT \n",
+ " 45 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | FRENTE \n",
" 46 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" FRENTE \n",
+ " 46 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | Sup_Terreno \n",
" 47 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" Sup_Terreno \n",
+ " 47 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | EXCEDENTE \n",
" 48 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" EXCEDENTE \n",
+ " 48 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | OTRO1 \n",
" 49 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" OTRO1 \n",
+ " 49 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | OTRO2 \n",
" 50 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" OTRO2 \n",
+ " 50 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | TAMANO \n",
" 51 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" TAMANO \n",
+ " 51 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | UBICAVER \n",
" 52 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" UBICAVER \n",
+ " 52 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | UBICAHORI \n",
" 53 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" UBICAHORI \n",
+ " 53 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | QTYONHND_ \n",
" 54 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" QTYONHND_ \n",
+ " 54 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | QTYSOLD \n",
" 55 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" QTYSOLD \n",
+ " 55 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | INACTIVE \n",
" 56 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" INACTIVE \n",
+ " 56 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | UOMPRICE \n",
" 57 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" UOMPRICE \n",
+ " 57 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | MONTOAPA \n",
" 58 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" MONTOAPA \n",
+ " 58 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | PAGINI \n",
" 59 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" PAGINI \n",
+ " 59 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | ENGANCHE \n",
" 60 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" ENGANCHE \n",
+ " 60 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | FECHESCRIPRO \n",
" 61 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" FECHESCRIPRO \n",
+ " 61 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | FECHAENTREGA \n",
" 62 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" FECHAENTREGA \n",
+ " 62 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | FECHASALIDAVENTAS \n",
" 63 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" FECHASALIDAVENTAS \n",
+ " 63 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | LIBERADO_NOLIBERADO \n",
" 64 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" LIBERADO_NOLIBERADO \n",
+ " 64 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | ACTIVO_INACTIVO \n",
" 65 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" ACTIVO_INACTIVO \n",
+ " 65 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | Estatus1Vivienda \n",
" 66 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" Estatus1Vivienda \n",
+ " 66 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | Estatus2Vivienda \n",
" 67 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" Estatus2Vivienda \n",
+ " 67 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | CUSTNMBR \n",
" 68 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" CUSTNMBR \n",
+ " 68 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | Nombre_Completo \n",
" 69 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" Nombre_Completo \n",
+ " 69 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cNombre \n",
" 70 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cNombre \n",
+ " 70 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cApellidoPaterno \n",
" 71 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cApellidoPaterno \n",
+ " 71 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cApellidoMaterno \n",
" 72 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cApellidoMaterno \n",
+ " 72 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cRfc \n",
" 73 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cRfc \n",
+ " 73 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cCurp \n",
" 74 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cCurp \n",
+ " 74 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | fkIdGradoInteres \n",
" 75 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" fkIdGradoInteres \n",
+ " 75 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cSexo \n",
" 76 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cSexo \n",
+ " 76 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cEmail \n",
" 77 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cEmail \n",
+ " 77 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cTelefonoCasa \n",
" 78 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cTelefonoCasa \n",
+ " 78 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cTelefonoCelular \n",
" 79 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cTelefonoCelular \n",
+ " 79 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cTelefonoTrabajo \n",
" 80 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cTelefonoTrabajo \n",
+ " 80 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cNumeroSeguroSocial \n",
" 81 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cNumeroSeguroSocial \n",
+ " 81 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | dFechaNacimiento \n",
" 82 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" dFechaNacimiento \n",
+ " 82 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cEstadoCivil \n",
" 83 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cEstadoCivil \n",
+ " 83 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cRegimenConyugal \n",
" 84 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cRegimenConyugal \n",
+ " 84 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cNacionalidad \n",
" 85 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cNacionalidad \n",
+ " 85 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cLugarNacimiento \n",
" 86 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cLugarNacimiento \n",
+ " 86 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cRecomendadoPor \n",
" 87 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cRecomendadoPor \n",
+ " 87 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | fkIdMedio \n",
" 88 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" fkIdMedio \n",
+ " 88 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cMedioContacto \n",
" 89 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cMedioContacto \n",
+ " 89 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cCalle \n",
" 90 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cCalle \n",
+ " 90 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cNumeroExterior \n",
" 91 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cNumeroExterior \n",
+ " 91 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cNumeroInterior \n",
" 92 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cNumeroInterior \n",
+ " 92 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cColonia \n",
" 93 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cColonia \n",
+ " 93 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cMunicipio \n",
" 94 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cMunicipio \n",
+ " 94 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cEstado \n",
" 95 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cEstado \n",
+ " 95 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cPais \n",
" 96 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cPais \n",
+ " 96 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cCodigoPostal \n",
" 97 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cCodigoPostal \n",
+ " 97 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | nTiempoResidencia \n",
" 98 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" nTiempoResidencia \n",
+ " 98 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cComentario \n",
" 99 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cComentario \n",
+ " 99 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cNumeroIdentificacion \n",
" 100 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cNumeroIdentificacion \n",
+ " 100 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | cTipoIdentificación \n",
" 101 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" cTipoIdentificación \n",
+ " 101 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | REFERENCIA \n",
" 102 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" REFERENCIA \n",
+ " 102 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | FACTURA \n",
" 103 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" FACTURA \n",
+ " 103 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | NOTACR \n",
" 104 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" NOTACR \n",
+ " 104 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | Precio_cierre \n",
" 105 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" Precio_cierre \n",
+ " 105 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | Precio_cierre_Tot \n",
" 106 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" Precio_cierre_Tot \n",
+ " 106 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | Aumento_al_Contrato \n",
" 107 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" Aumento_al_Contrato \n",
+ " 107 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | Condonacón \n",
" 108 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" Condonacón \n",
+ " 108 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | Precio_Escritura_Total \n",
" 109 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" Precio_Escritura_Total \n",
+ " 109 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | Precio_Dev \n",
" 110 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" Precio_Dev \n",
+ " 110 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | Precio_Dev_Total \n",
" 111 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" Precio_Dev_Total \n",
+ " 111 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | Notarios_Proyectados \n",
" 112 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" Notarios_Proyectados \n",
+ " 112 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | Gatos_A_terceros \n",
" 113 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" Gatos_A_terceros \n",
+ " 113 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | Depositos \n",
" 114 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" Depositos \n",
+ " 114 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | Saldo \n",
" 115 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" Saldo \n",
+ " 115 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | dFechaCreacion \n",
" 116 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" dFechaCreacion \n",
+ " 116 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | dFechaModificacion \n",
" 117 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" dFechaModificacion \n",
+ " 117 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | FECHA_Cotizado \n",
" 118 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" FECHA_Cotizado \n",
+ " 118 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | FECHA_SolApartado \n",
" 119 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" FECHA_SolApartado \n",
+ " 119 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | FECHA_AutApartado \n",
" 120 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" FECHA_AutApartado \n",
+ " 120 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | Vigencia_Apartado \n",
" 121 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" Vigencia_Apartado \n",
+ " 121 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | FechaVencimientoApartado \n",
" 122 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" FechaVencimientoApartado \n",
+ " 122 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | FECHA_SolDictamen \n",
" 123 (string) \n",
" \n",
+=======
+ " \n",
+ " | \n",
" \n",
+<<<<<<< Updated upstream
" FECHA_SolDictamen \n",
+ " 123 (string) \n",
+ " \n",
+>>>>>>> Stashed changes
" \n",
" nullable\n",
" \n",
" \n",
" \n",
" | FECHA_ProcDictamen \n",
" 124 (string) \n",
" \n",
+=======
+ " \n",
+ " | |
---|