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 "
Viewing 7 of 7 rows / 16 columns
\n", +======= + "
Viewing 2 of 2 rows / 16 columns
\n", +>>>>>>> Stashed changes "
1 partition(s)
\n", "\n", "\n", @@ -82872,130 +82960,194 @@ " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", @@ -83004,135 +83156,200 @@ " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", " \n", " \n", " \n", +======= + " \n", + "
\n", +<<<<<<< Updated upstream "
\n", " \n", " Optim'us\n", " \n", +======= + "
Optim'us\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " -28\n", " \n", +======= + "
-28\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " Leader\n", " \n", +======= + "
Leader\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 10\n", " \n", +======= + "
10\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 5000000\n", " \n", +======= + "
5000000\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 4.300000190734863\n", " \n", +======= + "
4.300000190734863\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " ['Inochi',⋅'Convoy']\n", " \n", +======= + "
['Inochi',⋅'Convoy']\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 19.442735,-99.201111\n", " \n", +======= + "
19.442735,-99.201111\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 1980/04/10\n", " \n", +======= + "
1980/04/10\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 2016/09/10\n", " \n", +======= + "
2016/09/10\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " [8.53439998626709,⋅4300.0]\n", " \n", +======= + "
[8.53439998626709,⋅4300.0]\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 2016-09-10\n", " \n", +======= + "
2016-09-10\n", +>>>>>>> Stashed changes "
\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", +<<<<<<< Updated upstream "
\n", " \n", " True\n", " \n", +======= + "
True\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " bytearray(b'Leader')\n", " \n", +======= + "
bytearray(b'Leader')\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
None\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " bumbl#ebéé⋅⋅\n", " \n", +======= + "
Metroplex_)^$\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 17\n", " \n", +======= + "
300\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " Espionage\n", " \n", +======= + "
Battle⋅Station\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 7\n", " \n", +======= + "
8\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 5000000\n", " \n", +======= + "
5000000\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 2.0\n", " \n", +======= + "
None\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " ['Bumble',⋅'Goldback']\n", " \n", +======= + "
['Metroflex']\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 10.642707,-71.612534\n", " \n", +======= + "
None\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 1980/04/10\n", " \n", +======= + "
1980/04/10\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 2015/08/10\n", " \n", +======= + "
2011/04/10\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " [5.334000110626221,⋅2000.0]\n", " \n", +======= + "
[91.44000244140625,⋅None]\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 2015-08-10\n", " \n", +======= + "
2011-04-10\n", +>>>>>>> Stashed changes "
\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", +<<<<<<< Updated upstream "
\n", " \n", " True\n", " \n", +======= + "
True\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " bytearray(b'Espionage')\n", " \n", +======= + "
bytearray(b'Battle⋅Station')\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
None\n", +>>>>>>> Stashed changes "
\n", "
\n", @@ -83264,66 +83481,315 @@ "
\n", + "\n", + "\n", + "
Viewing 2 of 2 rows / 16 columns
\n", + "
1 partition(s)
\n" + ], + "text/plain": [ + "" + ] + }, + "metadata": {}, + "output_type": "display_data" + } + ], + "source": [ + "t.create(None, \"outliers.tukey\", None, \"df\",\"select\", numeric_col)" + ] + }, + { + "cell_type": "code", + "execution_count": 15, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Creating test_outliers_tukey_drop() test function...\n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "INFO:optimus:test_outliers_tukey_drop()\n", + "INFO:optimus:percentile() executed in 1.76 sec\n" + ] + }, + { + "data": { + "text/html": [ + "\n", + "\n", + "\n", + "\n", + "\n", + "
Viewing 3 of 3 rows / 16 columns
\n", + "
1 partition(s)
\n", + "\n", + "\n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + "\n", + " \n", + " \n", +>>>>>>> Stashed changes " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", @@ -83532,130 +84033,194 @@ " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", @@ -83664,130 +84229,194 @@ " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", @@ -83797,7 +84426,11 @@ "
\n", + "
names
\n", + "
1 (string)
\n", + "
\n", + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
height(ft)
\n", + "
2 (smallint)
\n", + "
\n", + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
function
\n", + "
3 (string)
\n", + "
\n", + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
rank
\n", + "
4 (tinyint)
\n", + "
\n", + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
age
\n", + "
5 (int)
\n", + "
\n", + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
weight(t)
\n", + "
6 (float)
\n", + "
\n", + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
japanese name
\n", + "
7 (array<string>)
\n", + "
\n", + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
last position seen
\n", + "
8 (string)
\n", + "
\n", + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
date arrival
\n", + "
9 (string)
\n", + "
\n", + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
last date seen
\n", + "
10 (string)
\n", + "
\n", + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
attributes
\n", + "
11 (array<float>)
\n", + "
\n", + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
Date Type
\n", + "
12 (date)
\n", + "
\n", + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
timestamp
\n", + "
13 (timestamp)
\n", + "
\n", + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
Cybertronian
\n", + "
14 (boolean)
\n", + "
\n", + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
function(binary)
\n", + "
15 (binary)
\n", + "
\n", + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
NullType
\n", + "
16 (null)
\n", + "
\n", + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", +<<<<<<< Updated upstream "
\n", " \n", " Jazz\n", " \n", +======= + "
bumbl#ebéé⋅⋅\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 13\n", " \n", +======= + "
17\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " First⋅Lieutenant\n", " \n", +======= + "
Espionage\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 8\n", " \n", +======= + "
7\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 5000000\n", " \n", +======= + "
5000000\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 1.7999999523162842\n", " \n", +======= + "
2.0\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " ['Meister']\n", " \n", +======= + "
['Bumble',⋅'Goldback']\n", +>>>>>>> Stashed changes "
\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", +<<<<<<< Updated upstream "
\n", " \n", " 1980/04/10\n", " \n", +======= + "
1980/04/10\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 2012/05/10\n", " \n", +======= + "
2015/08/10\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " [None,⋅5700.0]\n", " \n", +======= + "
[5.334000110626221,⋅2000.0]\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 2012-05-10\n", " \n", +======= + "
2015-08-10\n", +>>>>>>> Stashed changes "
\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", +<<<<<<< Updated upstream "
\n", " \n", " True\n", " \n", +======= + "
True\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " bytearray(b'None')\n", " \n", +======= + "
bytearray(b'Espionage')\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
None\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " Metroplex_)^$\n", " \n", +======= + "
ironhide&\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 300\n", " \n", +======= + "
26\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " Battle⋅Station\n", " \n", +======= + "
Security\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 8\n", " \n", +======= + "
7\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 5000000\n", " \n", +======= + "
5000000\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
4.0\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " ['Metroflex']\n", " \n", +======= + "
['Roadbuster']\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
37.789563,-122.400356\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 1980/04/10\n", " \n", +======= + "
1980/04/10\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 2011/04/10\n", " \n", +======= + "
2014/07/10\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " [91.44000244140625,⋅None]\n", " \n", +======= + "
[7.924799919128418,⋅4000.0]\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 2011-04-10\n", " \n", +======= + "
2014-06-24\n", +>>>>>>> Stashed changes "
\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", +<<<<<<< Updated upstream "
\n", " \n", " True\n", " \n", +======= + "
True\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " bytearray(b'Battle⋅Station')\n", " \n", +======= + "
bytearray(b'Security')\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
None\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
Jazz\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
13\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
First⋅Lieutenant\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
8\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
5000000\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
1.7999999523162842\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
['Meister']\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
33.670666,-117.841553\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
1980/04/10\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
2013/06/10\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
[3.962399959564209,⋅1800.0]\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
2013-06-24\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
2014-06-24⋅00:00:00\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
True\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
bytearray(b'First⋅Lieutenant')\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
None\n", +>>>>>>> Stashed changes "
\n", "
\n", "\n", "\n", +<<<<<<< Updated upstream "
Viewing 7 of 7 rows / 16 columns
\n", +======= + "
Viewing 3 of 3 rows / 16 columns
\n", +>>>>>>> Stashed changes "
1 partition(s)
\n" ], "text/plain": [ @@ -83809,6 +84442,7 @@ } ], "source": [ +<<<<<<< Updated upstream "import pandas as pd\n", "from pyspark.sql.types import *\n", "from datetime import date, datetime\n", @@ -83856,10 +84490,14 @@ " ]\n", "source_df = op.create.df(cols ,rows)\n", "source_df.table()" +======= + "t.create(None, \"outliers.tukey\", None, \"df\",\"drop\", numeric_col)" +>>>>>>> Stashed changes ] }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 94, "metadata": {}, "outputs": [], @@ -83869,10 +84507,41 @@ " \"nan = np.nan\",\n", " \"import datetime\",\n", " \"from pyspark.sql import functions as F\"], path = \"df_outliers\", final_path=\"..\")" +======= + "execution_count": 16, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Creating test_outliers_tukey_whiskers() test function...\n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "INFO:optimus:test_outliers_tukey_whiskers()\n", + "INFO:optimus:percentile() executed in 1.68 sec\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "{'lower_bound': -6.5, 'upper_bound': 45.5, 'iqr1': 13, 'iqr3': 26}\n" + ] + } + ], + "source": [ + "t.create(None, \"outliers.tukey\", None, \"json\", \"whiskers\", numeric_col)" +>>>>>>> Stashed changes ] }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 95, "metadata": {}, "outputs": [], @@ -83898,24 +84567,94 @@ "metadata": {}, "source": [ "## Tukey" +======= + "execution_count": 17, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Creating test_outliers_tukey_count() test function...\n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "INFO:optimus:test_outliers_tukey_count()\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "7\n" + ] + } + ], + "source": [ + "t.create(None, \"outliers.tukey\", None, \"json\", \"count\", numeric_col)" + ] + }, + { + "cell_type": "code", + "execution_count": 18, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Creating test_outliers_tukey_non_outliers_count() test function...\n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "INFO:optimus:test_outliers_tukey_non_outliers_count()\n", + "INFO:optimus:percentile() executed in 1.63 sec\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "3\n" + ] + } + ], + "source": [ + "t.create(None, \"outliers.tukey\", None, \"json\", \"non_outliers_count\", numeric_col)" +>>>>>>> Stashed changes ] }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 84, +======= + "execution_count": 19, +>>>>>>> Stashed changes "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "Creating test_outliers_tukey_select() test function...\n" +======= + "Creating test_outliers_tukey_info() test function...\n" +>>>>>>> Stashed changes ] }, { "name": "stderr", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "INFO:optimus:test_outliers_tukey_select()\n", "INFO:optimus:percentile() executed in 3.06 sec\n", "INFO:optimus:percentile() executed in 3.23 sec\n" @@ -83948,6 +84687,106 @@ " \n", " \n", "
height(ft)
\n", +======= + "INFO:optimus:test_outliers_tukey_info()\n", + "INFO:optimus:percentile() executed in 1.66 sec\n", + "INFO:optimus:percentile() executed in 1.62 sec\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "{'count_outliers': 7, 'count_non_outliers': 3, 'lower_bound': -6.5, 'upper_bound': 45.5, 'iqr1': 13, 'iqr3': 26}\n" + ] + } + ], + "source": [ + "t.create(None, \"outliers.tukey\", None, \"json\", \"info\", numeric_col)" + ] + }, + { + "cell_type": "code", + "execution_count": 20, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Creating file ../test_df_outliers.py\n", + "Done\n" + ] + } + ], + "source": [ + "t.run()" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## Zscore" + ] + }, + { + "cell_type": "code", + "execution_count": 21, + "metadata": {}, + "outputs": [], + "source": [ + "threshold = 0.5" + ] + }, + { + "cell_type": "code", + "execution_count": 22, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Creating test_outliers_z_score_select() test function...\n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "INFO:optimus:test_outliers_z_score_select()\n", + "INFO:optimus:Using 'column_exp' to process column 'height(ft)' with function _z_score\n" + ] + }, + { + "data": { + "text/html": [ + "\n", + "\n", + "\n", + "\n", + "\n", + "
Viewing 2 of 2 rows / 16 columns
\n", + "
1 partition(s)
\n", + "\n", + "\n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", @@ -84236,130 +85139,194 @@ " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \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, last position seen: string, date arrival: string, last date seen: string, attributes: array, Date Type: date, timestamp: timestamp, Cybertronian: boolean, function(binary): binary, NullType: null]" ] }, +<<<<<<< Updated upstream "execution_count": 97, +======= + "execution_count": 23, +>>>>>>> Stashed changes "metadata": {}, "output_type": "execute_result" } ], "source": [ +<<<<<<< Updated upstream "source_df.outliers.tukey(numeric_col).drop()" +======= + "source_df.outliers.z_score('height(ft)',0.5).select()" +>>>>>>> Stashed changes ] }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 96, +======= + "execution_count": 24, +>>>>>>> Stashed changes "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "Creating test_outliers_tukey_drop() test function...\n" +======= + "Creating test_outliers_z_score_drop() test function...\n" +>>>>>>> Stashed changes ] }, { "name": "stderr", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "INFO:optimus:test_outliers_tukey_drop()\n", "INFO:optimus:percentile() executed in 3.25 sec\n" +======= + "INFO:optimus:test_outliers_z_score_drop()\n", + "INFO:optimus:Using 'column_exp' to process column 'height(ft)' with function _z_score\n" +>>>>>>> Stashed changes ] }, { @@ -84439,7 +85439,11 @@ "\n", "\n", "\n", +<<<<<<< Updated upstream "
Viewing 0 of 0 rows / 16 columns
\n", +======= + "
Viewing 3 of 3 rows / 16 columns
\n", +>>>>>>> Stashed changes "
1 partition(s)
\n", "\n", "
\n", + "
names
\n", + "
1 (string)
\n", + "
\n", + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
height(ft)
\n", +>>>>>>> Stashed changes "
2 (smallint)
\n", "
\n", " \n", @@ -84104,130 +84943,194 @@ "
\n", +<<<<<<< Updated upstream "
\n", " \n", " Optim'us\n", " \n", +======= + "
Optim'us\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " -28\n", " \n", +======= + "
-28\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " Leader\n", " \n", +======= + "
Leader\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 10\n", " \n", +======= + "
10\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 5000000\n", " \n", +======= + "
5000000\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 4.300000190734863\n", " \n", +======= + "
4.300000190734863\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " ['Inochi',⋅'Convoy']\n", " \n", +======= + "
['Inochi',⋅'Convoy']\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 19.442735,-99.201111\n", " \n", +======= + "
19.442735,-99.201111\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 1980/04/10\n", " \n", +======= + "
1980/04/10\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 2016/09/10\n", " \n", +======= + "
2016/09/10\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " [8.53439998626709,⋅4300.0]\n", " \n", +======= + "
[8.53439998626709,⋅4300.0]\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 2016-09-10\n", " \n", +======= + "
2016-09-10\n", +>>>>>>> Stashed changes "
\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", +<<<<<<< Updated upstream "
\n", " \n", " True\n", " \n", +======= + "
True\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " bytearray(b'Leader')\n", " \n", +======= + "
bytearray(b'Leader')\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
None\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " Metroplex_)^$\n", " \n", +======= + "
Metroplex_)^$\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 300\n", " \n", +======= + "
300\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " Battle⋅Station\n", " \n", +======= + "
Battle⋅Station\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 8\n", " \n", +======= + "
8\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 5000000\n", " \n", +======= + "
5000000\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
None\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " ['Metroflex']\n", " \n", +======= + "
['Metroflex']\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
None\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 1980/04/10\n", " \n", +======= + "
1980/04/10\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 2011/04/10\n", " \n", +======= + "
2011/04/10\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " [91.44000244140625,⋅None]\n", " \n", +======= + "
[91.44000244140625,⋅None]\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 2011-04-10\n", " \n", +======= + "
2011-04-10\n", +>>>>>>> Stashed changes "
\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", +<<<<<<< Updated upstream "
\n", " \n", " True\n", " \n", +======= + "
True\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " bytearray(b'Battle⋅Station')\n", " \n", +======= + "
bytearray(b'Battle⋅Station')\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
None\n", +>>>>>>> Stashed changes "
\n", "
\n", @@ -84611,11 +85615,270 @@ " \n", " \n", " \n", +<<<<<<< Updated upstream +======= + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", +>>>>>>> Stashed changes " \n", "
\n", + "
bumbl#ebéé⋅⋅\n", + "
\n", + "
\n", + "
17\n", + "
\n", + "
\n", + "
Espionage\n", + "
\n", + "
\n", + "
7\n", + "
\n", + "
\n", + "
5000000\n", + "
\n", + "
\n", + "
2.0\n", + "
\n", + "
\n", + "
['Bumble',⋅'Goldback']\n", + "
\n", + "
\n", + "
10.642707,-71.612534\n", + "
\n", + "
\n", + "
1980/04/10\n", + "
\n", + "
\n", + "
2015/08/10\n", + "
\n", + "
\n", + "
[5.334000110626221,⋅2000.0]\n", + "
\n", + "
\n", + "
2015-08-10\n", + "
\n", + "
\n", + "
2014-06-24⋅00:00:00\n", + "
\n", + "
\n", + "
True\n", + "
\n", + "
\n", + "
bytearray(b'Espionage')\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
ironhide&\n", + "
\n", + "
\n", + "
26\n", + "
\n", + "
\n", + "
Security\n", + "
\n", + "
\n", + "
7\n", + "
\n", + "
\n", + "
5000000\n", + "
\n", + "
\n", + "
4.0\n", + "
\n", + "
\n", + "
['Roadbuster']\n", + "
\n", + "
\n", + "
37.789563,-122.400356\n", + "
\n", + "
\n", + "
1980/04/10\n", + "
\n", + "
\n", + "
2014/07/10\n", + "
\n", + "
\n", + "
[7.924799919128418,⋅4000.0]\n", + "
\n", + "
\n", + "
2014-06-24\n", + "
\n", + "
\n", + "
2014-06-24⋅00:00:00\n", + "
\n", + "
\n", + "
True\n", + "
\n", + "
\n", + "
bytearray(b'Security')\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
Jazz\n", + "
\n", + "
\n", + "
13\n", + "
\n", + "
\n", + "
First⋅Lieutenant\n", + "
\n", + "
\n", + "
8\n", + "
\n", + "
\n", + "
5000000\n", + "
\n", + "
\n", + "
1.7999999523162842\n", + "
\n", + "
\n", + "
['Meister']\n", + "
\n", + "
\n", + "
33.670666,-117.841553\n", + "
\n", + "
\n", + "
1980/04/10\n", + "
\n", + "
\n", + "
2013/06/10\n", + "
\n", + "
\n", + "
[3.962399959564209,⋅1800.0]\n", + "
\n", + "
\n", + "
2013-06-24\n", + "
\n", + "
\n", + "
2014-06-24⋅00:00:00\n", + "
\n", + "
\n", + "
True\n", + "
\n", + "
\n", + "
bytearray(b'First⋅Lieutenant')\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", "\n", "\n", +<<<<<<< Updated upstream "
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", @@ -84996,130 +86361,194 @@ " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", @@ -85128,135 +86557,200 @@ " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", +<<<<<<< Updated upstream " \n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " Optim'us\n", " \n", +======= + "
Optim'us\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " -28\n", " \n", +======= + "
-28\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " Leader\n", " \n", +======= + "
Leader\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 10\n", " \n", +======= + "
10\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 5000000\n", " \n", +======= + "
5000000\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 4.300000190734863\n", " \n", +======= + "
4.300000190734863\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " ['Inochi',⋅'Convoy']\n", " \n", +======= + "
['Inochi',⋅'Convoy']\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 19.442735,-99.201111\n", " \n", +======= + "
19.442735,-99.201111\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 1980/04/10\n", " \n", +======= + "
1980/04/10\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 2016/09/10\n", " \n", +======= + "
2016/09/10\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " [8.53439998626709,⋅4300.0]\n", " \n", +======= + "
[8.53439998626709,⋅4300.0]\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 2016-09-10\n", " \n", +======= + "
2016-09-10\n", +>>>>>>> Stashed changes "
\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", +<<<<<<< Updated upstream "
\n", " \n", " True\n", " \n", +======= + "
True\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " bytearray(b'Leader')\n", " \n", +======= + "
bytearray(b'Leader')\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
None\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " Metroplex_)^$\n", " \n", +======= + "
ironhide&\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 300\n", " \n", +======= + "
26\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " Battle⋅Station\n", " \n", +======= + "
Security\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 8\n", " \n", +======= + "
7\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 5000000\n", " \n", +======= + "
5000000\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
4.0\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " ['Metroflex']\n", " \n", +======= + "
['Roadbuster']\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
37.789563,-122.400356\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 1980/04/10\n", " \n", +======= + "
1980/04/10\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 2011/04/10\n", " \n", +======= + "
2014/07/10\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " [91.44000244140625,⋅None]\n", " \n", +======= + "
[7.924799919128418,⋅4000.0]\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 2011-04-10\n", " \n", +======= + "
2014-06-24\n", +>>>>>>> Stashed changes "
\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", +<<<<<<< Updated upstream "
\n", " \n", " True\n", " \n", +======= + "
True\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " bytearray(b'Battle⋅Station')\n", " \n", +======= + "
bytearray(b'Security')\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
None\n", +>>>>>>> Stashed changes "
\n", "
\n", "\n", @@ -85301,26 +86795,141 @@ ], "source": [ "source_df.outliers.z_score('height(ft)',0.5).select()" +======= + " \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", + " \n", + " \n", + " \n", + " \n", + "\n", + "\n", + "\n", + "
Viewing 3 of 3 rows / 16 columns
\n", + "
1 partition(s)
\n" + ], + "text/plain": [ + "" + ] + }, + "metadata": {}, + "output_type": "display_data" + } + ], + "source": [ + "t.create(None, \"outliers.modified_z_score\", None, \"df\",\"select\", numeric_col, threshold, relative_error)" +>>>>>>> Stashed changes ] }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 14, +======= + "execution_count": 36, +>>>>>>> Stashed changes "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "Creating test_outliers_z_score_drop() test function...\n" +======= + "Creating test_outliers_modified_z_score_drop() test function...\n" +>>>>>>> Stashed changes ] }, { "name": "stderr", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "INFO:optimus:test_outliers_z_score_drop()\n", "INFO:optimus:Using 'column_exp' to process column 'height(ft)' with function _z_score\n" +======= + "INFO:optimus:test_outliers_modified_z_score_drop()\n" +>>>>>>> Stashed changes ] }, { @@ -85331,7 +86940,11 @@ "\n", "\n", "\n", +<<<<<<< Updated upstream "
Viewing 3 of 3 rows / 16 columns
\n", +======= + "
Viewing 2 of 2 rows / 16 columns
\n", +>>>>>>> Stashed changes "
1 partition(s)
\n", "\n", "\n", @@ -85506,6 +87119,7 @@ " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", @@ -85770,130 +87447,194 @@ " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", " \n", @@ -85903,7 +87644,11 @@ "
\n", +<<<<<<< Updated upstream "
\n", " \n", " bumbl#ebéé⋅⋅\n", @@ -85642,126 +87256,189 @@ " \n", " ironhide&\n", " \n", +======= + "
bumbl#ebéé⋅⋅\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 26\n", " \n", +======= + "
17\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " Security\n", " \n", +======= + "
Espionage\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 7\n", " \n", +======= + "
7\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 5000000\n", " \n", +======= + "
5000000\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 4.0\n", " \n", +======= + "
2.0\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " ['Roadbuster']\n", " \n", +======= + "
['Bumble',⋅'Goldback']\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 37.789563,-122.400356\n", " \n", +======= + "
10.642707,-71.612534\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 1980/04/10\n", " \n", +======= + "
1980/04/10\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 2014/07/10\n", " \n", +======= + "
2015/08/10\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " [7.924799919128418,⋅4000.0]\n", " \n", +======= + "
[5.334000110626221,⋅2000.0]\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 2014-06-24\n", " \n", +======= + "
2015-08-10\n", +>>>>>>> Stashed changes "
\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", +<<<<<<< Updated upstream "
\n", " \n", " True\n", " \n", +======= + "
True\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " bytearray(b'Security')\n", " \n", +======= + "
bytearray(b'Espionage')\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
None\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " Jazz\n", " \n", +======= + "
Jazz\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 13\n", " \n", +======= + "
13\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " First⋅Lieutenant\n", " \n", +======= + "
First⋅Lieutenant\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 8\n", " \n", +======= + "
8\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 5000000\n", " \n", +======= + "
5000000\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 1.7999999523162842\n", " \n", +======= + "
1.7999999523162842\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " ['Meister']\n", " \n", +======= + "
['Meister']\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 33.670666,-117.841553\n", " \n", +======= + "
33.670666,-117.841553\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 1980/04/10\n", " \n", +======= + "
1980/04/10\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 2013/06/10\n", " \n", +======= + "
2013/06/10\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " [3.962399959564209,⋅1800.0]\n", " \n", +======= + "
[3.962399959564209,⋅1800.0]\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " 2013-06-24\n", " \n", +======= + "
2013-06-24\n", +>>>>>>> Stashed changes "
\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", +<<<<<<< Updated upstream "
\n", " \n", " True\n", " \n", +======= + "
True\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " bytearray(b'First⋅Lieutenant')\n", " \n", +======= + "
bytearray(b'First⋅Lieutenant')\n", +>>>>>>> Stashed changes "
\n", "
\n", +<<<<<<< Updated upstream "
\n", " \n", " None\n", " \n", +======= + "
None\n", +>>>>>>> Stashed changes "
\n", "
\n", "\n", "\n", +<<<<<<< Updated upstream "
Viewing 3 of 3 rows / 16 columns
\n", +======= + "
Viewing 2 of 2 rows / 16 columns
\n", +>>>>>>> Stashed changes "
1 partition(s)
\n" ], "text/plain": [ @@ -85915,109 +87660,177 @@ } ], "source": [ +<<<<<<< Updated upstream "t.create(None, \"outliers.z_score\", None, \"df\",\"drop\", numeric_col, threshold)" +======= + "t.create(None, \"outliers.modified_z_score\", None, \"df\",\"drop\", numeric_col, threshold, relative_error)" +>>>>>>> Stashed changes ] }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 15, +======= + "execution_count": 37, +>>>>>>> Stashed changes "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "Creating test_outliers_z_score_count() test function...\n" +======= + "Creating test_outliers_modified_z_score_count() test function...\n" +>>>>>>> Stashed changes ] }, { "name": "stderr", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "INFO:optimus:test_outliers_z_score_count()\n", "INFO:optimus:Using 'column_exp' to process column 'height(ft)' with function _z_score\n" +======= + "INFO:optimus:test_outliers_modified_z_score_count()\n" +>>>>>>> Stashed changes ] }, { "name": "stdout", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "2\n" +======= + "3\n" +>>>>>>> Stashed changes ] } ], "source": [ +<<<<<<< Updated upstream "t.create(None, \"outliers.z_score\", None, \"json\", \"count\", numeric_col, threshold)" +======= + "t.create(None, \"outliers.modified_z_score\", None, \"json\",\"count\", numeric_col, threshold, relative_error)" +>>>>>>> Stashed changes ] }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 16, +======= + "execution_count": 38, +>>>>>>> Stashed changes "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "Creating test_outliers_z_score_non_outliers_count() test function...\n" +======= + "Creating test_outliers_modified_z_score_non_outliers_count() test function...\n" +>>>>>>> Stashed changes ] }, { "name": "stderr", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "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" +======= + "INFO:optimus:test_outliers_modified_z_score_non_outliers_count()\n" +>>>>>>> Stashed changes ] }, { "name": "stdout", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "3\n" +======= + "2\n" +>>>>>>> Stashed changes ] } ], "source": [ +<<<<<<< Updated upstream "t.create(None, \"outliers.z_score\", None, \"json\", \"non_outliers_count\", numeric_col, threshold)" +======= + "t.create(None, \"outliers.modified_z_score\", None, \"json\",\"non_outliers_count\", numeric_col, threshold, relative_error)" +>>>>>>> Stashed changes ] }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 17, +======= + "execution_count": 39, +>>>>>>> Stashed changes "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "Creating test_outliers_z_score_info() test function...\n" +======= + "Creating test_outliers_modified_z_score_info() test function...\n" +>>>>>>> Stashed changes ] }, { "name": "stderr", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "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:test_outliers_modified_z_score_info()\n" +>>>>>>> Stashed changes ] }, { "name": "stdout", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "{'count_outliers': 2, 'count_non_outliers': 3, 'max_z_score': 1.76684}\n" +======= + "{'count_outliers': 3, 'count_non_outliers': 2, 'max_m_z_score': 21.20928}\n" +>>>>>>> Stashed changes ] } ], "source": [ +<<<<<<< Updated upstream "t.create(None, \"outliers.z_score\", None, \"json\", \"info\", numeric_col, threshold)" +======= + "t.create(None, \"outliers.modified_z_score\", None, \"json\",\"info\", numeric_col, threshold, relative_error)" +>>>>>>> Stashed changes ] }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 18, +======= + "execution_count": 40, +>>>>>>> Stashed changes "metadata": {}, "outputs": [ { @@ -86037,12 +87850,20 @@ "cell_type": "markdown", "metadata": {}, "source": [ +<<<<<<< Updated upstream "## Modified Zscore" +======= + "## Mad" +>>>>>>> Stashed changes ] }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 19, +======= + "execution_count": 43, +>>>>>>> Stashed changes "metadata": {}, "outputs": [], "source": [ @@ -86052,21 +87873,33 @@ }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 20, +======= + "execution_count": 44, +>>>>>>> Stashed changes "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "Creating test_outliers_modified_z_score_select() test function...\n" +======= + "Creating test_outliers_mad_select() test function...\n" +>>>>>>> Stashed changes ] }, { "name": "stderr", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "INFO:optimus:test_outliers_modified_z_score_select()\n" +======= + "INFO:optimus:test_outliers_mad_select()\n" +>>>>>>> Stashed changes ] }, { @@ -86252,130 +88085,194 @@ " \n", " \n", " \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", @@ -86384,130 +88281,194 @@ " \n", " \n", " \n", +<<<<<<< Updated upstream "
\n", " \n", " ironhide&\n", " \n", +======= + "
ironhide&\n", +>>>>>>> Stashed changes "
\n", " \n", " \n", " \n", +<<<<<<< Updated upstream "
\n", " \n", " 26\n", " \n", +======= + "
26\n", +>>>>>>> Stashed changes "
\n", " \n", " \n", " \n", +<<<<<<< Updated upstream "
\n", " \n", " Security\n", " \n", +======= + "
Security\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", +======= + "
4.0\n", +>>>>>>> Stashed changes "
\n", " \n", " \n", " \n", +<<<<<<< Updated upstream "
\n", " \n", " ['Roadbuster']\n", " \n", +======= + "
['Roadbuster']\n", +>>>>>>> Stashed changes "
\n", " \n", " \n", " \n", +<<<<<<< Updated upstream "
\n", " \n", " 37.789563,-122.400356\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", " 2014/07/10\n", " \n", +======= + "
2014/07/10\n", +>>>>>>> Stashed changes "
\n", " \n", " \n", " \n", +<<<<<<< Updated upstream "
\n", " \n", " [7.924799919128418,⋅4000.0]\n", " \n", +======= + "
[7.924799919128418,⋅4000.0]\n", +>>>>>>> Stashed changes "
\n", " \n", " \n", " \n", +<<<<<<< Updated upstream "
\n", " \n", " 2014-06-24\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'Security')\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", @@ -86516,130 +88477,194 @@ " \n", " \n", " \n", +<<<<<<< Updated upstream "
\n", " \n", " Metroplex_)^$\n", " \n", +======= + "
Metroplex_)^$\n", +>>>>>>> Stashed changes "
\n", " \n", " \n", " \n", +<<<<<<< Updated upstream "
\n", " \n", " 300\n", " \n", +======= + "
300\n", +>>>>>>> Stashed changes "
\n", " \n", " \n", " \n", +<<<<<<< Updated upstream "
\n", " \n", " Battle⋅Station\n", " \n", +======= + "
Battle⋅Station\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", " None\n", " \n", +======= + "
None\n", +>>>>>>> Stashed changes "
\n", " \n", " \n", " \n", +<<<<<<< Updated upstream "
\n", " \n", " ['Metroflex']\n", " \n", +======= + "
['Metroflex']\n", +>>>>>>> Stashed changes "
\n", " \n", " \n", " \n", +<<<<<<< Updated upstream "
\n", " \n", " None\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", " 2011/04/10\n", " \n", +======= + "
2011/04/10\n", +>>>>>>> Stashed changes "
\n", " \n", " \n", " \n", +<<<<<<< Updated upstream "
\n", " \n", " [91.44000244140625,⋅None]\n", " \n", +======= + "
[91.44000244140625,⋅None]\n", +>>>>>>> Stashed changes "
\n", " \n", " \n", " \n", +<<<<<<< Updated upstream "
\n", " \n", " 2011-04-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'Battle⋅Station')\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", @@ -86661,26 +88686,42 @@ } ], "source": [ +<<<<<<< Updated upstream "t.create(None, \"outliers.modified_z_score\", None, \"df\",\"select\", numeric_col, threshold, relative_error)" +======= + "t.create(None, \"outliers.mad\", None, \"df\",\"select\", numeric_col, threshold, relative_error)" +>>>>>>> Stashed changes ] }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 21, +======= + "execution_count": 45, +>>>>>>> Stashed changes "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "Creating test_outliers_modified_z_score_drop() test function...\n" +======= + "Creating test_outliers_mad_drop() test function...\n" +>>>>>>> Stashed changes ] }, { "name": "stderr", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "INFO:optimus:test_outliers_modified_z_score_drop()\n" +======= + "INFO:optimus:test_outliers_mad_drop()\n" +>>>>>>> Stashed changes ] }, { @@ -86866,130 +88907,194 @@ " \n", " \n", " \n", +<<<<<<< Updated upstream "
\n", " \n", " bumbl#ebéé⋅⋅\n", " \n", +======= + "
bumbl#ebéé⋅⋅\n", +>>>>>>> Stashed changes "
\n", " \n", " \n", " \n", +<<<<<<< Updated upstream "
\n", " \n", " 17\n", " \n", +======= + "
17\n", +>>>>>>> Stashed changes "
\n", " \n", " \n", " \n", +<<<<<<< Updated upstream "
\n", " \n", " Espionage\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", " 2.0\n", " \n", +======= + "
2.0\n", +>>>>>>> Stashed changes "
\n", " \n", " \n", " \n", +<<<<<<< Updated upstream "
\n", " \n", " ['Bumble',⋅'Goldback']\n", " \n", +======= + "
['Bumble',⋅'Goldback']\n", +>>>>>>> Stashed changes "
\n", " \n", " \n", " \n", +<<<<<<< Updated upstream "
\n", " \n", " 10.642707,-71.612534\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", " 2015/08/10\n", " \n", +======= + "
2015/08/10\n", +>>>>>>> Stashed changes "
\n", " \n", " \n", " \n", +<<<<<<< Updated upstream "
\n", " \n", " [5.334000110626221,⋅2000.0]\n", " \n", +======= + "
[5.334000110626221,⋅2000.0]\n", +>>>>>>> Stashed changes "
\n", " \n", " \n", " \n", +<<<<<<< Updated upstream "
\n", " \n", " 2015-08-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'Espionage')\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", @@ -86998,130 +89103,194 @@ " \n", " \n", " \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", @@ -87143,26 +89312,42 @@ } ], "source": [ +<<<<<<< Updated upstream "t.create(None, \"outliers.modified_z_score\", None, \"df\",\"drop\", numeric_col, threshold, relative_error)" +======= + "t.create(None, \"outliers.mad\", None, \"df\",\"drop\", numeric_col, threshold, relative_error)" +>>>>>>> Stashed changes ] }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 22, +======= + "execution_count": 46, +>>>>>>> Stashed changes "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "Creating test_outliers_modified_z_score_count() test function...\n" +======= + "Creating test_outliers_mad_count() test function...\n" +>>>>>>> Stashed changes ] }, { "name": "stderr", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "INFO:optimus:test_outliers_modified_z_score_count()\n" +======= + "INFO:optimus:test_outliers_mad_count()\n" +>>>>>>> Stashed changes ] }, { @@ -87174,26 +89359,42 @@ } ], "source": [ +<<<<<<< Updated upstream "t.create(None, \"outliers.modified_z_score\", None, \"json\",\"count\", numeric_col, threshold, relative_error)" +======= + "t.create(None, \"outliers.mad\", None, \"json\",\"count\", numeric_col, threshold, relative_error)" +>>>>>>> Stashed changes ] }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 23, +======= + "execution_count": 47, +>>>>>>> Stashed changes "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "Creating test_outliers_modified_z_score_non_outliers_count() test function...\n" +======= + "Creating test_outliers_mad_non_outliers_count() test function...\n" +>>>>>>> Stashed changes ] }, { "name": "stderr", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "INFO:optimus:test_outliers_modified_z_score_non_outliers_count()\n" +======= + "INFO:optimus:test_outliers_mad_non_outliers_count()\n" +>>>>>>> Stashed changes ] }, { @@ -87205,43 +89406,71 @@ } ], "source": [ +<<<<<<< Updated upstream "t.create(None, \"outliers.modified_z_score\", None, \"json\",\"non_outliers_count\", numeric_col, threshold, relative_error)" +======= + "t.create(None, \"outliers.mad\", None, \"json\",\"non_outliers_count\", numeric_col, threshold, relative_error)" +>>>>>>> Stashed changes ] }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 24, +======= + "execution_count": 48, +>>>>>>> Stashed changes "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "Creating test_outliers_modified_z_score_info() test function...\n" +======= + "Creating test_outliers_mad_info() test function...\n" +>>>>>>> Stashed changes ] }, { "name": "stderr", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "INFO:optimus:test_outliers_modified_z_score_info()\n" +======= + "INFO:optimus:test_outliers_mad_info()\n" +>>>>>>> Stashed changes ] }, { "name": "stdout", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "{'count_outliers': 3, 'count_non_outliers': 2, 'max_m_z_score': 21.20928}\n" +======= + "{'count_outliers': 3, 'count_non_outliers': 2, 'lower_bound': 12.5, 'upper_bound': 21.5}\n" +>>>>>>> Stashed changes ] } ], "source": [ +<<<<<<< Updated upstream "t.create(None, \"outliers.modified_z_score\", None, \"json\",\"info\", numeric_col, threshold, relative_error)" +======= + "t.create(None, \"outliers.mad\", None, \"json\",\"info\", numeric_col, threshold, relative_error)" +>>>>>>> Stashed changes ] }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 25, +======= + "execution_count": 49, +>>>>>>> Stashed changes "metadata": {}, "outputs": [ { @@ -87261,36 +89490,86 @@ "cell_type": "markdown", "metadata": {}, "source": [ +<<<<<<< Updated upstream "## Mad" +======= + "## Keycolision" +>>>>>>> Stashed changes ] }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": null, "metadata": {}, "outputs": [], "source": [ "threshold = 0.5\n", "relative_error = 10000" +======= + "execution_count": 31, + "metadata": {}, + "outputs": [], + "source": [ + "df = op.read.csv(\"../../examples/data/random.csv\",header=True, sep=\";\").limit(100)" +>>>>>>> Stashed changes ] }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 87, "metadata": {}, +======= + "execution_count": 32, + "metadata": {}, + "outputs": [], + "source": [ + "t = Test(op, df, \"df_keycollision\", 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\",\n", + " \"from optimus.ml import keycollision as keyCol\"], \n", + " path = \"df_keycollision\", final_path=\"..\")\n", + "\n", + "from optimus.ml import keycollision as keyCol" + ] + }, + { + "cell_type": "code", + "execution_count": 195, + "metadata": { + "inputHidden": false, + "outputHidden": false + }, +>>>>>>> Stashed changes "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "Creating test_outliers_mad_select() test function...\n" +======= + "Creating test_fingerprint() test function...\n" +>>>>>>> Stashed changes ] }, { "name": "stderr", "output_type": "stream", "text": [ +<<<<<<< Updated upstream "INFO:optimus:test_outliers_mad_select()\n" +======= + "INFO:optimus:test_fingerprint()\n", + "INFO:optimus:Using 'column_exp' to process column 'STATE_FINGERPRINT' with function _trim\n", + "INFO:optimus:Using 'column_exp' to process column 'STATE_FINGERPRINT' with function _lower\n", + "INFO:optimus:Using 'pandas_udf' to process column 'STATE_FINGERPRINT' with function multiple_replace\n", + "INFO:optimus:Using 'pandas_udf' to process column 'STATE_FINGERPRINT' with function _remove_accents\n", + "INFO:optimus:Using 'pandas_udf' to process column 'STATE_FINGERPRINT' with function _split_sort_remove_join\n" +>>>>>>> Stashed changes ] }, { @@ -87301,6 +89580,7 @@ "\n", "\n", "\n", +<<<<<<< Updated upstream "
Viewing 3 of 3 rows / 16 columns
\n", "
1 partition(s)
\n", "\n", @@ -87312,122 +89592,213 @@ "
names
\n", "
1 (string)
\n", "
\n", +======= + "
Viewing 10 of 100 rows / 137 columns
\n", + "
1 partition(s)
\n", + "\n", + "\n", + " \n", + " \n", + " \n", + " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", +<<<<<<< Updated upstream " \n", "\n", " \n", +<<<<<<< Updated upstream " \n", " \n", " \n", @@ -103350,6 +106596,831 @@ " \n", " distritofederal\n", " \n", +======= + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", @@ -103357,6 +107428,7 @@ " \n", " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", - " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", @@ -105557,6 +109350,7 @@ " \n", " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", " \n", " \n", " \n", @@ -105710,9 +109504,9 @@ " \n", " \n", " \n", @@ -106650,6 +110444,827 @@ " \n", " distritofederal\n", " \n", +======= + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", @@ -106657,6 +111272,7 @@ " \n", " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", " \n", " \n", " \n", @@ -106810,9 +111426,9 @@ " \n", " \n", " \n", @@ -106842,9 +111458,9 @@ " \n", " \n", " \n", @@ -107750,1106 +112366,827 @@ " \n", " distritofederal\n", " \n", +======= + " \n", " \n", - " \n", - " \n", - " \n", + " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", @@ -108857,6 +113194,7 @@ " \n", " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", " \n", " \n", " \n", @@ -109010,9 +113348,9 @@ " \n", " \n", " \n", @@ -109042,9 +113380,9 @@ " \n", " \n", " \n", @@ -109950,6 +114288,827 @@ " \n", " distritofederal\n", " \n", +======= + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", @@ -109957,6 +115116,7 @@ " \n", " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", " \n", " \n", " \n", @@ -110110,9 +115270,9 @@ " \n", " \n", " \n", @@ -110142,9 +115302,9 @@ " \n", " \n", " \n", @@ -111050,1106 +116210,827 @@ " \n", " distritofederal\n", " \n", +======= + " \n", " \n", - " \n", - " \n", - " \n", + " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", @@ -112157,6 +117038,7 @@ " \n", " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", " \n", " \n", " \n", @@ -112310,9 +117192,9 @@ " \n", " \n", " \n", @@ -112342,9 +117224,9 @@ " \n", " \n", " \n", @@ -113250,1515 +118132,15041 @@ " \n", " distritofederal\n", " \n", +======= + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + "
\n", + "
LOCNCODE
\n", + "
1 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
height(ft)
\n", "
2 (smallint)
\n", "
\n", +======= + "
\n", + "
LOCNDSCR
\n", + "
2 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
function
\n", "
3 (string)
\n", "
\n", +======= + "
\n", + "
ADDRESS1
\n", + "
3 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
rank
\n", "
4 (tinyint)
\n", "
\n", +======= + "
\n", + "
ADDRESS2
\n", + "
4 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
age
\n", "
5 (int)
\n", "
\n", +======= + "
\n", + "
ADDRESS3
\n", + "
5 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
weight(t)
\n", "
6 (float)
\n", "
\n", +======= + "
\n", + "
CITY
\n", + "
6 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
japanese name
\n", "
7 (array<string>)
\n", "
\n", +======= + "
\n", + "
STATE
\n", + "
7 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
last position seen
\n", "
8 (string)
\n", "
\n", +======= + "
\n", + "
ZIPCODE
\n", + "
8 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
date arrival
\n", "
9 (string)
\n", "
\n", +======= + "
\n", + "
COUNTRY
\n", + "
9 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
last date seen
\n", "
10 (string)
\n", "
\n", +======= + "
\n", + "
Location_Segment
\n", + "
10 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
attributes
\n", "
11 (array<float>)
\n", "
\n", +======= + "
\n", + "
PAQ
\n", + "
11 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
Date Type
\n", "
12 (date)
\n", "
\n", +======= + "
\n", + "
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", + "
Tipo_unidad
\n", + "
13 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
ITEMNMBR
\n", "
14 (string)
\n", "
\n", +======= + "
\n", + "
ITEMNMBR
\n", + "
14 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
ITMSHNAM
\n", "
15 (string)
\n", "
\n", +======= + "
\n", + "
ITMSHNAM
\n", + "
15 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
MZ
\n", "
16 (string)
\n", "
\n", +======= + "
\n", + "
MZ
\n", + "
16 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
LT
\n", "
17 (string)
\n", "
\n", +======= + "
\n", + "
LT
\n", + "
17 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
EDIF
\n", "
18 (string)
\n", "
\n", +======= + "
\n", + "
EDIF
\n", + "
18 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
NIVEL
\n", "
19 (string)
\n", "
\n", +======= + "
\n", + "
NIVEL
\n", + "
19 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
NOUNI
\n", "
20 (string)
\n", "
\n", +======= + "
\n", + "
NOUNI
\n", + "
20 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
CONDO
\n", "
21 (string)
\n", "
\n", +======= + "
\n", + "
CONDO
\n", + "
21 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
REGIMEN
\n", "
22 (string)
\n", "
\n", +======= + "
\n", + "
REGIMEN
\n", + "
22 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
ETAPA
\n", "
23 (string)
\n", "
\n", +======= + "
\n", + "
ETAPA
\n", + "
23 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
PROTO
\n", "
24 (string)
\n", "
\n", +======= + "
\n", + "
PROTO
\n", + "
24 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
ITEMDESC
\n", "
25 (string)
\n", "
\n", +======= + "
\n", + "
ITEMDESC
\n", + "
25 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
NIVELES
\n", "
26 (string)
\n", "
\n", +======= + "
\n", + "
NIVELES
\n", + "
26 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
COCHERA
\n", "
27 (string)
\n", "
\n", +======= + "
\n", + "
COCHERA
\n", + "
27 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
RECAM
\n", "
28 (string)
\n", "
\n", +======= + "
\n", + "
RECAM
\n", + "
28 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
ALCOB
\n", "
29 (string)
\n", "
\n", +======= + "
\n", + "
ALCOB
\n", + "
29 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
BANOS
\n", "
30 (string)
\n", "
\n", +======= + "
\n", + "
BANOS
\n", + "
30 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
Num_Balcon
\n", "
31 (string)
\n", "
\n", +======= + "
\n", + "
Num_Balcon
\n", + "
31 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
SALA
\n", "
32 (string)
\n", "
\n", +======= + "
\n", + "
SALA
\n", + "
32 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
COMEDOR
\n", "
33 (string)
\n", "
\n", +======= + "
\n", + "
COMEDOR
\n", + "
33 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
COCINA
\n", "
34 (string)
\n", "
\n", +======= + "
\n", + "
COCINA
\n", + "
34 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
Cuarto_Lavado
\n", "
35 (string)
\n", "
\n", +======= + "
\n", + "
Cuarto_Lavado
\n", + "
35 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
Cuarto_Servicio
\n", "
36 (string)
\n", "
\n", +======= + "
\n", + "
Cuarto_Servicio
\n", + "
36 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
OTROX
\n", "
37 (string)
\n", "
\n", +======= + "
\n", + "
OTROX
\n", + "
37 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
OTROX1
\n", "
38 (string)
\n", "
\n", +======= + "
\n", + "
OTROX1
\n", + "
38 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
SupCons
\n", "
39 (string)
\n", "
\n", +======= + "
\n", + "
SupCons
\n", + "
39 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
PATIOSERV
\n", "
40 (string)
\n", "
\n", +======= + "
\n", + "
PATIOSERV
\n", + "
40 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
TERRAZA
\n", "
41 (string)
\n", "
\n", +======= + "
\n", + "
TERRAZA
\n", + "
41 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
BALCON
\n", "
42 (string)
\n", "
\n", +======= + "
\n", + "
BALCON
\n", + "
42 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
AZOTEA
\n", "
43 (string)
\n", "
\n", +======= + "
\n", + "
AZOTEA
\n", + "
43 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
Otros
\n", "
44 (string)
\n", "
\n", +======= + "
\n", + "
Otros
\n", + "
44 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
AREATOT
\n", "
45 (string)
\n", "
\n", +======= + "
\n", + "
AREATOT
\n", + "
45 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
FRENTE
\n", "
46 (string)
\n", "
\n", +======= + "
\n", + "
FRENTE
\n", + "
46 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
Sup_Terreno
\n", "
47 (string)
\n", "
\n", +======= + "
\n", + "
Sup_Terreno
\n", + "
47 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
EXCEDENTE
\n", "
48 (string)
\n", "
\n", +======= + "
\n", + "
EXCEDENTE
\n", + "
48 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
OTRO1
\n", "
49 (string)
\n", "
\n", +======= + "
\n", + "
OTRO1
\n", + "
49 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
OTRO2
\n", "
50 (string)
\n", "
\n", +======= + "
\n", + "
OTRO2
\n", + "
50 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
TAMANO
\n", "
51 (string)
\n", "
\n", +======= + "
\n", + "
TAMANO
\n", + "
51 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
UBICAVER
\n", "
52 (string)
\n", "
\n", +======= + "
\n", + "
UBICAVER
\n", + "
52 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
UBICAHORI
\n", "
53 (string)
\n", "
\n", +======= + "
\n", + "
UBICAHORI
\n", + "
53 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
QTYONHND_
\n", "
54 (string)
\n", "
\n", +======= + "
\n", + "
QTYONHND_
\n", + "
54 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
QTYSOLD
\n", "
55 (string)
\n", "
\n", +======= + "
\n", + "
QTYSOLD
\n", + "
55 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
INACTIVE
\n", "
56 (string)
\n", "
\n", +======= + "
\n", + "
INACTIVE
\n", + "
56 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
UOMPRICE
\n", "
57 (string)
\n", "
\n", +======= + "
\n", + "
UOMPRICE
\n", + "
57 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
MONTOAPA
\n", "
58 (string)
\n", "
\n", +======= + "
\n", + "
MONTOAPA
\n", + "
58 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
PAGINI
\n", "
59 (string)
\n", "
\n", +======= + "
\n", + "
PAGINI
\n", + "
59 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
ENGANCHE
\n", "
60 (string)
\n", "
\n", +======= + "
\n", + "
ENGANCHE
\n", + "
60 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
FECHESCRIPRO
\n", "
61 (string)
\n", "
\n", +======= + "
\n", + "
FECHESCRIPRO
\n", + "
61 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
FECHAENTREGA
\n", "
62 (string)
\n", "
\n", +======= + "
\n", + "
FECHAENTREGA
\n", + "
62 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
FECHASALIDAVENTAS
\n", "
63 (string)
\n", "
\n", +======= + "
\n", + "
FECHASALIDAVENTAS
\n", + "
63 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
LIBERADO_NOLIBERADO
\n", "
64 (string)
\n", "
\n", +======= + "
\n", + "
LIBERADO_NOLIBERADO
\n", + "
64 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
ACTIVO_INACTIVO
\n", "
65 (string)
\n", "
\n", +======= + "
\n", + "
ACTIVO_INACTIVO
\n", + "
65 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
Estatus1Vivienda
\n", "
66 (string)
\n", "
\n", +======= + "
\n", + "
Estatus1Vivienda
\n", + "
66 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
Estatus2Vivienda
\n", "
67 (string)
\n", "
\n", +======= + "
\n", + "
Estatus2Vivienda
\n", + "
67 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
CUSTNMBR
\n", "
68 (string)
\n", "
\n", +======= + "
\n", + "
CUSTNMBR
\n", + "
68 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
Nombre_Completo
\n", "
69 (string)
\n", "
\n", +======= + "
\n", + "
Nombre_Completo
\n", + "
69 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cNombre
\n", "
70 (string)
\n", "
\n", +======= + "
\n", + "
cNombre
\n", + "
70 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cApellidoPaterno
\n", "
71 (string)
\n", "
\n", +======= + "
\n", + "
cApellidoPaterno
\n", + "
71 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cApellidoMaterno
\n", "
72 (string)
\n", "
\n", +======= + "
\n", + "
cApellidoMaterno
\n", + "
72 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cRfc
\n", "
73 (string)
\n", "
\n", +======= + "
\n", + "
cRfc
\n", + "
73 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cCurp
\n", "
74 (string)
\n", "
\n", +======= + "
\n", + "
cCurp
\n", + "
74 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
fkIdGradoInteres
\n", "
75 (string)
\n", "
\n", +======= + "
\n", + "
fkIdGradoInteres
\n", + "
75 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cSexo
\n", "
76 (string)
\n", "
\n", +======= + "
\n", + "
cSexo
\n", + "
76 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cEmail
\n", "
77 (string)
\n", "
\n", +======= + "
\n", + "
cEmail
\n", + "
77 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cTelefonoCasa
\n", "
78 (string)
\n", "
\n", +======= + "
\n", + "
cTelefonoCasa
\n", + "
78 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cTelefonoCelular
\n", "
79 (string)
\n", "
\n", +======= + "
\n", + "
cTelefonoCelular
\n", + "
79 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cTelefonoTrabajo
\n", "
80 (string)
\n", "
\n", +======= + "
\n", + "
cTelefonoTrabajo
\n", + "
80 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cNumeroSeguroSocial
\n", "
81 (string)
\n", "
\n", +======= + "
\n", + "
cNumeroSeguroSocial
\n", + "
81 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
dFechaNacimiento
\n", "
82 (string)
\n", "
\n", +======= + "
\n", + "
dFechaNacimiento
\n", + "
82 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cEstadoCivil
\n", "
83 (string)
\n", "
\n", +======= + "
\n", + "
cEstadoCivil
\n", + "
83 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cRegimenConyugal
\n", "
84 (string)
\n", "
\n", +======= + "
\n", + "
cRegimenConyugal
\n", + "
84 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cNacionalidad
\n", "
85 (string)
\n", "
\n", +======= + "
\n", + "
cNacionalidad
\n", + "
85 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cLugarNacimiento
\n", "
86 (string)
\n", "
\n", +======= + "
\n", + "
cLugarNacimiento
\n", + "
86 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cRecomendadoPor
\n", "
87 (string)
\n", "
\n", +======= + "
\n", + "
cRecomendadoPor
\n", + "
87 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
fkIdMedio
\n", "
88 (string)
\n", "
\n", +======= + "
\n", + "
fkIdMedio
\n", + "
88 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cMedioContacto
\n", "
89 (string)
\n", "
\n", +======= + "
\n", + "
cMedioContacto
\n", + "
89 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cCalle
\n", "
90 (string)
\n", "
\n", +======= + "
\n", + "
cCalle
\n", + "
90 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cNumeroExterior
\n", "
91 (string)
\n", "
\n", +======= + "
\n", + "
cNumeroExterior
\n", + "
91 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cNumeroInterior
\n", "
92 (string)
\n", "
\n", +======= + "
\n", + "
cNumeroInterior
\n", + "
92 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cColonia
\n", "
93 (string)
\n", "
\n", +======= + "
\n", + "
cColonia
\n", + "
93 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cMunicipio
\n", "
94 (string)
\n", "
\n", +======= + "
\n", + "
cMunicipio
\n", + "
94 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cEstado
\n", "
95 (string)
\n", "
\n", +======= + "
\n", + "
cEstado
\n", + "
95 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cPais
\n", "
96 (string)
\n", "
\n", +======= + "
\n", + "
cPais
\n", + "
96 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cCodigoPostal
\n", "
97 (string)
\n", "
\n", +======= + "
\n", + "
cCodigoPostal
\n", + "
97 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
nTiempoResidencia
\n", "
98 (string)
\n", "
\n", +======= + "
\n", + "
nTiempoResidencia
\n", + "
98 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cComentario
\n", "
99 (string)
\n", "
\n", +======= + "
\n", + "
cComentario
\n", + "
99 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cNumeroIdentificacion
\n", "
100 (string)
\n", "
\n", +======= + "
\n", + "
cNumeroIdentificacion
\n", + "
100 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
cTipoIdentificación
\n", "
101 (string)
\n", "
\n", +======= + "
\n", + "
cTipoIdentificación
\n", + "
101 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
REFERENCIA
\n", "
102 (string)
\n", "
\n", +======= + "
\n", + "
REFERENCIA
\n", + "
102 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
FACTURA
\n", "
103 (string)
\n", "
\n", +======= + "
\n", + "
FACTURA
\n", + "
103 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
NOTACR
\n", "
104 (string)
\n", "
\n", +======= + "
\n", + "
NOTACR
\n", + "
104 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
Precio_cierre
\n", "
105 (string)
\n", "
\n", +======= + "
\n", + "
Precio_cierre
\n", + "
105 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
Precio_cierre_Tot
\n", "
106 (string)
\n", "
\n", +======= + "
\n", + "
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", + "
Aumento_al_Contrato
\n", + "
107 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
Condonacón
\n", "
108 (string)
\n", "
\n", +======= + "
\n", + "
Condonacón
\n", + "
108 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
Precio_Escritura_Total
\n", "
109 (string)
\n", "
\n", +======= + "
\n", + "
Precio_Escritura_Total
\n", + "
109 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
Precio_Dev
\n", "
110 (string)
\n", "
\n", +======= + "
\n", + "
Precio_Dev
\n", + "
110 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
Precio_Dev_Total
\n", "
111 (string)
\n", "
\n", +======= + "
\n", + "
Precio_Dev_Total
\n", + "
111 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
Notarios_Proyectados
\n", "
112 (string)
\n", "
\n", +======= + "
\n", + "
Notarios_Proyectados
\n", + "
112 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
Gatos_A_terceros
\n", "
113 (string)
\n", "
\n", +======= + "
\n", + "
Gatos_A_terceros
\n", + "
113 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
Depositos
\n", "
114 (string)
\n", "
\n", +======= + "
\n", + "
Depositos
\n", + "
114 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
Saldo
\n", "
115 (string)
\n", "
\n", +======= + "
\n", + "
Saldo
\n", + "
115 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
dFechaCreacion
\n", "
116 (string)
\n", "
\n", +======= + "
\n", + "
dFechaCreacion
\n", + "
116 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
dFechaModificacion
\n", "
117 (string)
\n", "
\n", +======= + "
\n", + "
dFechaModificacion
\n", + "
117 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
FECHA_Cotizado
\n", "
118 (string)
\n", "
\n", +======= + "
\n", + "
FECHA_Cotizado
\n", + "
118 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
FECHA_SolApartado
\n", "
119 (string)
\n", "
\n", +======= + "
\n", + "
FECHA_SolApartado
\n", + "
119 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
FECHA_AutApartado
\n", "
120 (string)
\n", "
\n", +======= + "
\n", + "
FECHA_AutApartado
\n", + "
120 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
Vigencia_Apartado
\n", "
121 (string)
\n", "
\n", +======= + "
\n", + "
Vigencia_Apartado
\n", + "
121 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
FechaVencimientoApartado
\n", "
122 (string)
\n", "
\n", +======= + "
\n", + "
FechaVencimientoApartado
\n", + "
122 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
FECHA_SolDictamen
\n", "
123 (string)
\n", "
\n", +======= + "
\n", + "
FECHA_SolDictamen
\n", + "
123 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
FECHA_ProcDictamen
\n", "
124 (string)
\n", "
\n", +======= + "
\n", + "
FECHA_ProcDictamen
\n", + "
124 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
FECHA_DictaminadoLlamada
\n", "
125 (string)
\n", "
\n", +======= + "
\n", + "
FECHA_DictaminadoLlamada
\n", + "
125 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
FECHA_DictaminadoFirma
\n", "
126 (string)
\n", "
\n", +======= + "
\n", + "
FECHA_DictaminadoFirma
\n", + "
126 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
FECHA_Dictaminado
\n", "
127 (string)
\n", "
\n", +======= + "
\n", + "
FECHA_Dictaminado
\n", + "
127 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
FECHA_Rechazado
\n", "
128 (string)
\n", "
\n", +======= + "
\n", + "
FECHA_Rechazado
\n", + "
128 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
FECHA_EscrituraAvaluo
\n", "
129 (string)
\n", "
\n", +======= + "
\n", + "
FECHA_EscrituraAvaluo
\n", + "
129 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
FECHA_EscrituraFolio
\n", "
130 (string)
\n", "
\n", +======= + "
\n", + "
FECHA_EscrituraFolio
\n", + "
130 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
FolioEscsritura
\n", "
131 (string)
\n", "
\n", +======= + "
\n", + "
FolioEscsritura
\n", + "
131 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
FECHA_EscrituraReal
\n", "
132 (string)
\n", "
\n", +======= + "
\n", + "
FECHA_EscrituraReal
\n", + "
132 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
FECHA_Cancelado
\n", "
133 (string)
\n", "
\n", +======= + "
\n", + "
FECHA_Cancelado
\n", + "
133 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
FECHA_Liberado
\n", "
134 (string)
\n", "
\n", +======= + "
\n", + "
FECHA_Liberado
\n", + "
134 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
FECHA_Entregado
\n", "
135 (string)
\n", "
\n", +======= + "
\n", + "
FECHA_Entregado
\n", + "
135 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
MotivoCancelacion
\n", "
136 (string)
\n", "
\n", +======= + "
\n", + "
MotivoCancelacion
\n", + "
136 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", "
\n", "
\n", "
STATE***FINGERPRINT
\n", "
137 (string)
\n", "
\n", +======= + "
\n", + "
STATE_FINGERPRINT
\n", + "
137 (string)
\n", + "
\n", +>>>>>>> Stashed changes " \n", " nullable\n", " \n", @@ -102253,6 +105498,7 @@ "
\n", + "
ALV\n", + "
\n", + "
\n", + "
Altos⋅Lindavista\n", + "
\n", + "
\n", + "
Guanajuato⋅#⋅85\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
San⋅Bartolo⋅Atepehuacan\n", + "
\n", + "
\n", + "
Gustavo⋅A.⋅Madero\n", + "
\n", + "
\n", + "
Distrito⋅Federal\n", + "
\n", + "
\n", + "
07730\n", + "
\n", + "
\n", + "
Mexico\n", + "
\n", + "
\n", + "
0531\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2\n", + "
\n", + "
\n", + "
ESTACIONAMIENTO\n", + "
\n", + "
\n", + "
ALVV008\n", + "
\n", + "
\n", + "
ALVCDEY0080\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
008\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
EST⋅CDEY\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.2\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.4\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
Chico\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
1\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
NO⋅LIBERADO\n", + "
\n", + "
\n", + "
INACTIVO\n", + "
\n", + "
\n", + "
DISPONIBLE\n", + "
\n", + "
\n", + "
000-DISPONIBLE\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
distritofederal\n", +>>>>>>> Stashed changes "
\n", "
\n", "
\n", " \n", @@ -104450,1106 +108522,827 @@ " \n", " distritofederal\n", " \n", +======= + "
\n", + "
ALV\n", "
\n", "
\n", - "
\n", - " \n", - " ALV\n", - " \n", + "
\n", + "
Altos⋅Lindavista\n", "
\n", "
\n", - "
\n", - " \n", - " Altos⋅Lindavista\n", - " \n", + "
\n", + "
Guanajuato⋅#⋅85\n", "
\n", "
\n", - "
\n", - " \n", - " Guanajuato⋅#⋅85\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
San⋅Bartolo⋅Atepehuacan\n", "
\n", "
\n", - "
\n", - " \n", - " San⋅Bartolo⋅Atepehuacan\n", - " \n", + "
\n", + "
Gustavo⋅A.⋅Madero\n", "
\n", "
\n", - "
\n", - " \n", - " Gustavo⋅A.⋅Madero\n", - " \n", + "
\n", + "
Distrito⋅Federal\n", "
\n", "
\n", - "
\n", - " \n", - " Distrito⋅Federal\n", - " \n", + "
\n", + "
07730\n", "
\n", "
\n", - "
\n", - " \n", - " 07730\n", - " \n", + "
\n", + "
Mexico\n", "
\n", "
\n", - "
\n", - " \n", - " Mexico\n", - " \n", + "
\n", + "
0531\n", "
\n", "
\n", - "
\n", - " \n", - " 0531\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
2\n", "
\n", "
\n", - "
\n", - " \n", - " 2\n", - " \n", + "
\n", + "
ESTACIONAMIENTO\n", "
\n", "
\n", - "
\n", - " \n", - " ESTACIONAMIENTO\n", - " \n", + "
\n", + "
ALVV021\n", "
\n", "
\n", - "
\n", - " \n", - " ALVV022\n", - " \n", + "
\n", + "
ALVCDEY0690\n", "
\n", "
\n", - "
\n", - " \n", - " ALVCDEY0710\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
069\n", "
\n", "
\n", - "
\n", - " \n", - " 071\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
EST⋅CDEY\n", "
\n", "
\n", - "
\n", - " \n", - " EST⋅CDEY\n", - " \n", + "
\n", + "
Cajon⋅virtual\n", "
\n", "
\n", - "
\n", - " \n", - " Cajon⋅virtual\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", - "
\n", - "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " 2.2\n", - " \n", + "
\n", + "
2.2\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " 2.4\n", - " \n", + "
\n", + "
2.4\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " Chico\n", - " \n", + "
\n", + "
Chico\n", "
\n", "
\n", - "
\n", - " \n", - " Cajon⋅virtual\n", - " \n", + "
\n", + "
Cajon⋅virtual\n", "
\n", "
\n", - "
\n", - " \n", - " Cajon⋅virtual\n", - " \n", + "
\n", + "
Cajon⋅virtual\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " 1\n", - " \n", + "
\n", + "
1\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " NO⋅LIBERADO\n", - " \n", + "
\n", + "
NO⋅LIBERADO\n", "
\n", "
\n", - "
\n", - " \n", - " INACTIVO\n", - " \n", + "
\n", + "
INACTIVO\n", "
\n", "
\n", - "
\n", - " \n", - " DISPONIBLE\n", - " \n", + "
\n", + "
DISPONIBLE\n", "
\n", "
\n", - "
\n", - " \n", - " 000-DISPONIBLE\n", - " \n", + "
\n", + "
000-DISPONIBLE\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " distritofederal\n", - " \n", + "
\n", + "
distritofederal\n", +>>>>>>> Stashed changes "
\n", "
\n", "
\n", " \n", @@ -105662,17 +109456,17 @@ "
\n", - "
\n", + "
\n", " \n", - " ALVV027\n", + " ALVV022\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " ALVCDEY0810\n", + " ALVCDEY0710\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " 081\n", + " 071\n", " \n", "
\n", "
\n", + "
ALV\n", + "
\n", + "
\n", + "
Altos⋅Lindavista\n", + "
\n", + "
\n", + "
Guanajuato⋅#⋅85\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
San⋅Bartolo⋅Atepehuacan\n", + "
\n", + "
\n", + "
Gustavo⋅A.⋅Madero\n", + "
\n", + "
\n", + "
Distrito⋅Federal\n", + "
\n", + "
\n", + "
07730\n", + "
\n", + "
\n", + "
Mexico\n", + "
\n", + "
\n", + "
0531\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2\n", + "
\n", + "
\n", + "
ESTACIONAMIENTO\n", + "
\n", + "
\n", + "
ALVV022\n", + "
\n", + "
\n", + "
ALVCDEY0710\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
071\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
EST⋅CDEY\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.2\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.4\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
Chico\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
1\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
NO⋅LIBERADO\n", + "
\n", + "
\n", + "
INACTIVO\n", + "
\n", + "
\n", + "
DISPONIBLE\n", + "
\n", + "
\n", + "
000-DISPONIBLE\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
distritofederal\n", +>>>>>>> Stashed changes "
\n", "
\n", "
\n", " \n", @@ -106762,17 +111378,17 @@ "
\n", - "
\n", + "
\n", " \n", - " ALVV032\n", + " ALVV027\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " ALVCEEY0090\n", + " ALVCDEY0810\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " 009\n", + " 081\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " EST⋅CEEY\n", + " EST⋅CDEY\n", " \n", "
\n", "
\n", + "
ALV\n", "
\n", "
\n", + "
Altos⋅Lindavista\n", + "
\n", + "
\n", - "
\n", - " \n", - " ALV\n", - " \n", + "
\n", + "
Guanajuato⋅#⋅85\n", "
\n", "
\n", - "
\n", - " \n", - " Altos⋅Lindavista\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " Guanajuato⋅#⋅85\n", - " \n", + "
\n", + "
San⋅Bartolo⋅Atepehuacan\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
Gustavo⋅A.⋅Madero\n", "
\n", "
\n", - "
\n", - " \n", - " San⋅Bartolo⋅Atepehuacan\n", - " \n", + "
\n", + "
Distrito⋅Federal\n", "
\n", "
\n", - "
\n", - " \n", - " Gustavo⋅A.⋅Madero\n", - " \n", + "
\n", + "
07730\n", "
\n", "
\n", - "
\n", - " \n", - " Distrito⋅Federal\n", - " \n", + "
\n", + "
Mexico\n", "
\n", "
\n", - "
\n", - " \n", - " 07730\n", - " \n", + "
\n", + "
0531\n", "
\n", "
\n", - "
\n", - " \n", - " Mexico\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " 0531\n", - " \n", + "
\n", + "
2\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
ESTACIONAMIENTO\n", "
\n", "
\n", - "
\n", - " \n", - " 2\n", - " \n", + "
\n", + "
ALVV027\n", "
\n", "
\n", - "
\n", - " \n", - " ESTACIONAMIENTO\n", - " \n", + "
\n", + "
ALVCDEY0810\n", "
\n", "
\n", - "
\n", - " \n", - " ALVV035\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " ALVCEEY0150\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
081\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " 015\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
EST⋅CDEY\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
Cajon⋅virtual\n", "
\n", "
\n", - "
\n", - " \n", - " EST⋅CEEY\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " Cajon⋅virtual\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", - "
\n", - "
\n", - "
\n", - " \n", - " None\n", - " \n", - "
\n", - "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " 2.2\n", - " \n", + "
\n", + "
2.2\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " 2.4\n", - " \n", + "
\n", + "
2.4\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " Chico\n", - " \n", + "
\n", + "
Chico\n", "
\n", "
\n", - "
\n", - " \n", - " Cajon⋅virtual\n", - " \n", + "
\n", + "
Cajon⋅virtual\n", "
\n", "
\n", - "
\n", - " \n", - " Cajon⋅virtual\n", - " \n", + "
\n", + "
Cajon⋅virtual\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " 1\n", - " \n", + "
\n", + "
1\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " NO⋅LIBERADO\n", - " \n", + "
\n", + "
NO⋅LIBERADO\n", "
\n", "
\n", - "
\n", - " \n", - " INACTIVO\n", - " \n", + "
\n", + "
INACTIVO\n", "
\n", "
\n", - "
\n", - " \n", - " DISPONIBLE\n", - " \n", + "
\n", + "
DISPONIBLE\n", "
\n", "
\n", - "
\n", - " \n", - " 000-DISPONIBLE\n", - " \n", + "
\n", + "
000-DISPONIBLE\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " distritofederal\n", - " \n", + "
\n", + "
distritofederal\n", +>>>>>>> Stashed changes "
\n", "
\n", "
\n", " \n", @@ -108962,17 +113300,17 @@ "
\n", - "
\n", + "
\n", " \n", - " ALVV009\n", + " ALVV032\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " ALVCDEY0100\n", + " ALVCEEY0090\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " 010\n", + " 009\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " EST⋅CDEY\n", + " EST⋅CEEY\n", " \n", "
\n", "
\n", + "
ALV\n", + "
\n", + "
\n", + "
Altos⋅Lindavista\n", + "
\n", + "
\n", + "
Guanajuato⋅#⋅85\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
San⋅Bartolo⋅Atepehuacan\n", + "
\n", + "
\n", + "
Gustavo⋅A.⋅Madero\n", + "
\n", + "
\n", + "
Distrito⋅Federal\n", + "
\n", + "
\n", + "
07730\n", + "
\n", + "
\n", + "
Mexico\n", + "
\n", + "
\n", + "
0531\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2\n", + "
\n", + "
\n", + "
ESTACIONAMIENTO\n", + "
\n", + "
\n", + "
ALVV032\n", + "
\n", + "
\n", + "
ALVCEEY0090\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
009\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
EST⋅CEEY\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.2\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.4\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
Chico\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
1\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
NO⋅LIBERADO\n", + "
\n", + "
\n", + "
INACTIVO\n", + "
\n", + "
\n", + "
DISPONIBLE\n", + "
\n", + "
\n", + "
000-DISPONIBLE\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
distritofederal\n", +>>>>>>> Stashed changes "
\n", "
\n", "
\n", " \n", @@ -110062,17 +115222,17 @@ "
\n", - "
\n", + "
\n", " \n", - " ALVV012\n", + " ALVV035\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " ALVCDEY0160\n", + " ALVCEEY0150\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " 016\n", + " 015\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " EST⋅CDEY\n", + " EST⋅CEEY\n", " \n", "
\n", "
\n", + "
ALV\n", "
\n", "
\n", + "
Altos⋅Lindavista\n", + "
\n", + "
\n", - "
\n", - " \n", - " ALV\n", - " \n", + "
\n", + "
Guanajuato⋅#⋅85\n", "
\n", "
\n", - "
\n", - " \n", - " Altos⋅Lindavista\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " Guanajuato⋅#⋅85\n", - " \n", + "
\n", + "
San⋅Bartolo⋅Atepehuacan\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
Gustavo⋅A.⋅Madero\n", "
\n", "
\n", - "
\n", - " \n", - " San⋅Bartolo⋅Atepehuacan\n", - " \n", + "
\n", + "
Distrito⋅Federal\n", "
\n", "
\n", - "
\n", - " \n", - " Gustavo⋅A.⋅Madero\n", - " \n", + "
\n", + "
07730\n", "
\n", "
\n", - "
\n", - " \n", - " Distrito⋅Federal\n", - " \n", + "
\n", + "
Mexico\n", "
\n", "
\n", - "
\n", - " \n", - " 07730\n", - " \n", + "
\n", + "
0531\n", "
\n", "
\n", - "
\n", - " \n", - " Mexico\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " 0531\n", - " \n", + "
\n", + "
2\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
ESTACIONAMIENTO\n", "
\n", "
\n", - "
\n", - " \n", - " 2\n", - " \n", + "
\n", + "
ALVV035\n", "
\n", "
\n", - "
\n", - " \n", - " ESTACIONAMIENTO\n", - " \n", + "
\n", + "
ALVCEEY0150\n", "
\n", "
\n", - "
\n", - " \n", - " ALVV019\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " ALVCDEY0650\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
015\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " 065\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
EST⋅CEEY\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
Cajon⋅virtual\n", "
\n", "
\n", - "
\n", - " \n", - " EST⋅CDEY\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " Cajon⋅virtual\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", - "
\n", - "
\n", - "
\n", - " \n", - " None\n", - " \n", - "
\n", - "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " 2.2\n", - " \n", + "
\n", + "
2.2\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " 2.4\n", - " \n", + "
\n", + "
2.4\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " Chico\n", - " \n", + "
\n", + "
Chico\n", "
\n", "
\n", - "
\n", - " \n", - " Cajon⋅virtual\n", - " \n", + "
\n", + "
Cajon⋅virtual\n", "
\n", "
\n", - "
\n", - " \n", - " Cajon⋅virtual\n", - " \n", + "
\n", + "
Cajon⋅virtual\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " 1\n", - " \n", + "
\n", + "
1\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " NO⋅LIBERADO\n", - " \n", + "
\n", + "
NO⋅LIBERADO\n", "
\n", "
\n", - "
\n", - " \n", - " INACTIVO\n", - " \n", + "
\n", + "
INACTIVO\n", "
\n", "
\n", - "
\n", - " \n", - " DISPONIBLE\n", - " \n", + "
\n", + "
DISPONIBLE\n", "
\n", "
\n", - "
\n", - " \n", - " 000-DISPONIBLE\n", - " \n", + "
\n", + "
000-DISPONIBLE\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " distritofederal\n", - " \n", + "
\n", + "
distritofederal\n", +>>>>>>> Stashed changes "
\n", "
\n", "
\n", " \n", @@ -112262,17 +117144,17 @@ "
\n", - "
\n", + "
\n", " \n", - " ALVV044\n", + " ALVV009\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " ALVCUEY0340\n", + " ALVCDEY0100\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " 034\n", + " 010\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " EST⋅CUEY\n", + " EST⋅CDEY\n", " \n", "
\n", "
\n", + "
ALV\n", + "
\n", + "
\n", + "
Altos⋅Lindavista\n", + "
\n", + "
\n", + "
Guanajuato⋅#⋅85\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
San⋅Bartolo⋅Atepehuacan\n", + "
\n", + "
\n", + "
Gustavo⋅A.⋅Madero\n", + "
\n", + "
\n", + "
Distrito⋅Federal\n", + "
\n", + "
\n", + "
07730\n", + "
\n", + "
\n", + "
Mexico\n", + "
\n", + "
\n", + "
0531\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2\n", + "
\n", + "
\n", + "
ESTACIONAMIENTO\n", + "
\n", + "
\n", + "
ALVV009\n", + "
\n", + "
\n", + "
ALVCDEY0100\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
010\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
EST⋅CDEY\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.2\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.4\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
Chico\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
1\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
NO⋅LIBERADO\n", + "
\n", + "
\n", + "
INACTIVO\n", + "
\n", + "
\n", + "
DISPONIBLE\n", + "
\n", + "
\n", + "
000-DISPONIBLE\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
distritofederal\n", +>>>>>>> Stashed changes + "
\n", + "
\n", + "
\n", + " \n", + " ALV\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Altos⋅Lindavista\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Guanajuato⋅#⋅85\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " San⋅Bartolo⋅Atepehuacan\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Gustavo⋅A.⋅Madero\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Distrito⋅Federal\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 07730\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Mexico\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0531\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 2\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " ESTACIONAMIENTO\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " ALVV012\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " ALVCDEY0160\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 016\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " EST⋅CDEY\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Cajon⋅virtual\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 2.2\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 2.4\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Chico\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Cajon⋅virtual\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Cajon⋅virtual\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 1\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " NO⋅LIBERADO\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " INACTIVO\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " DISPONIBLE\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 000-DISPONIBLE\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " distritofederal\n", + " \n", +======= + "
\n", + "
ALV\n", + "
\n", + "
\n", + "
Altos⋅Lindavista\n", + "
\n", + "
\n", + "
Guanajuato⋅#⋅85\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
San⋅Bartolo⋅Atepehuacan\n", + "
\n", + "
\n", + "
Gustavo⋅A.⋅Madero\n", + "
\n", + "
\n", + "
Distrito⋅Federal\n", + "
\n", + "
\n", + "
07730\n", + "
\n", + "
\n", + "
Mexico\n", + "
\n", + "
\n", + "
0531\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2\n", + "
\n", + "
\n", + "
ESTACIONAMIENTO\n", + "
\n", + "
\n", + "
ALVV012\n", + "
\n", + "
\n", + "
ALVCDEY0160\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
016\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
EST⋅CDEY\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.2\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.4\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
Chico\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
1\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
NO⋅LIBERADO\n", + "
\n", + "
\n", + "
INACTIVO\n", + "
\n", + "
\n", + "
DISPONIBLE\n", + "
\n", + "
\n", + "
000-DISPONIBLE\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
distritofederal\n", +>>>>>>> Stashed changes + "
\n", + "
\n", + "
\n", + " \n", + " ALV\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Altos⋅Lindavista\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Guanajuato⋅#⋅85\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " San⋅Bartolo⋅Atepehuacan\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Gustavo⋅A.⋅Madero\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Distrito⋅Federal\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 07730\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Mexico\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0531\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 2\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " ESTACIONAMIENTO\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " ALVV019\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " ALVCDEY0650\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 065\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " EST⋅CDEY\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Cajon⋅virtual\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 2.2\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 2.4\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Chico\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Cajon⋅virtual\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Cajon⋅virtual\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 1\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " NO⋅LIBERADO\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " INACTIVO\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " DISPONIBLE\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 000-DISPONIBLE\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " distritofederal\n", + " \n", +======= + "
\n", + "
ALV\n", + "
\n", + "
\n", + "
Altos⋅Lindavista\n", + "
\n", + "
\n", + "
Guanajuato⋅#⋅85\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
San⋅Bartolo⋅Atepehuacan\n", + "
\n", + "
\n", + "
Gustavo⋅A.⋅Madero\n", + "
\n", + "
\n", + "
Distrito⋅Federal\n", + "
\n", + "
\n", + "
07730\n", + "
\n", + "
\n", + "
Mexico\n", + "
\n", + "
\n", + "
0531\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2\n", + "
\n", + "
\n", + "
ESTACIONAMIENTO\n", + "
\n", + "
\n", + "
ALVV019\n", + "
\n", + "
\n", + "
ALVCDEY0650\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
065\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
EST⋅CDEY\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.2\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.4\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
Chico\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
1\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
NO⋅LIBERADO\n", + "
\n", + "
\n", + "
INACTIVO\n", + "
\n", + "
\n", + "
DISPONIBLE\n", + "
\n", + "
\n", + "
000-DISPONIBLE\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
distritofederal\n", +>>>>>>> Stashed changes + "
\n", + "
\n", + "
\n", + " \n", + " ALV\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Altos⋅Lindavista\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Guanajuato⋅#⋅85\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " San⋅Bartolo⋅Atepehuacan\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Gustavo⋅A.⋅Madero\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Distrito⋅Federal\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 07730\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Mexico\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0531\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 2\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " ESTACIONAMIENTO\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " ALVV044\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " ALVCUEY0340\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 034\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " EST⋅CUEY\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Cajon⋅virtual\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 2.2\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 2.4\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Chico\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Cajon⋅virtual\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Cajon⋅virtual\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 1\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " NO⋅LIBERADO\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " INACTIVO\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " DISPONIBLE\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 000-DISPONIBLE\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " distritofederal\n", + " \n", +======= + "
\n", + "
ALV\n", + "
\n", + "
\n", + "
Altos⋅Lindavista\n", + "
\n", + "
\n", + "
Guanajuato⋅#⋅85\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
San⋅Bartolo⋅Atepehuacan\n", + "
\n", + "
\n", + "
Gustavo⋅A.⋅Madero\n", + "
\n", + "
\n", + "
Distrito⋅Federal\n", + "
\n", + "
\n", + "
07730\n", + "
\n", + "
\n", + "
Mexico\n", + "
\n", + "
\n", + "
0531\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2\n", + "
\n", + "
\n", + "
ESTACIONAMIENTO\n", + "
\n", + "
\n", + "
ALVV044\n", + "
\n", + "
\n", + "
ALVCUEY0340\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
034\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
EST⋅CUEY\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.2\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.4\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
Chico\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
1\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
NO⋅LIBERADO\n", + "
\n", + "
\n", + "
INACTIVO\n", + "
\n", + "
\n", + "
DISPONIBLE\n", + "
\n", + "
\n", + "
000-DISPONIBLE\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
distritofederal\n", +>>>>>>> Stashed changes + "
\n", + "
\n", + "\n", + "\n", +<<<<<<< Updated upstream + "
Viewing 10 of 10 rows / 137 columns
\n", + "
1 partition(s)
\n" +======= + "
Viewing 10 of 100 rows / 137 columns
\n", + "
1 partition(s)
\n" +>>>>>>> Stashed changes + ], + "text/plain": [ + "" + ] + }, + "metadata": {}, + "output_type": "display_data" + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Creating file ../test_df_keycollision.py\n", + "Done\n" + ] + } + ], + "source": [ + "t.create(keyCol, \"fingerprint\", None, \"df\",None, source_df, \"STATE\")\n", + "t.run()" + ] + }, + { + "cell_type": "code", +<<<<<<< Updated upstream + "execution_count": 73, +======= + "execution_count": 40, +>>>>>>> Stashed changes + "metadata": { + "inputHidden": false, + "outputHidden": false + }, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Creating test_fingerprint_cluster() test function...\n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "INFO:optimus:test_fingerprint_cluster()\n", + "INFO:optimus:Using 'column_exp' to process column 'STATE***FINGERPRINT' with function _trim\n", + "INFO:optimus:Using 'column_exp' to process column 'STATE***FINGERPRINT' with function _lower\n", + "INFO:optimus:Using 'pandas_udf' to process column 'STATE***FINGERPRINT' with function multiple_replace\n", + "INFO:optimus:Using 'pandas_udf' to process column 'STATE***FINGERPRINT' with function _remove_accents\n", + "INFO:optimus:Using 'pandas_udf' to process column 'STATE***FINGERPRINT' with function _split_sort_remove_join\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ +<<<<<<< Updated upstream + "{'Distrito Federal': {'similar': {'Distrito Federal': 10}, 'count': 1, 'sum': 10}}\n" +======= + "{'Estado de México': {'similar': {'Estado de México': 290}, 'count': 1, 'sum': 290}, 'Distrito Federal': {'similar': {'Distrito Federal': 710}, 'count': 1, 'sum': 710}}\n" +>>>>>>> Stashed changes + ] + } + ], + "source": [ + "t.create(keyCol, \"fingerprint_cluster\", None, \"json\", None, source_df, \"STATE\")" + ] + }, + { + "cell_type": "code", +<<<<<<< Updated upstream + "execution_count": 74, +======= + "execution_count": 42, +>>>>>>> Stashed changes + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ +<<<<<<< Updated upstream + "Creating file ../test_df_keycollision.py\n", +======= + "Creating file ../test_df_distance_cluster.py\n", +>>>>>>> Stashed changes + "Done\n" + ] + } + ], + "source": [ + "t.run()" + ] + }, + { + "cell_type": "code", +<<<<<<< Updated upstream + "execution_count": 75, +======= + "execution_count": 197, +>>>>>>> Stashed changes + "metadata": { + "inputHidden": false, + "outputHidden": false + }, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Creating test_n_gram_fingerprint() test function...\n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "INFO:optimus:test_n_gram_fingerprint()\n", +<<<<<<< Updated upstream + "INFO:optimus:Using 'column_exp' to process column 'STATE***FINGERPRINT' with function _lower\n", + "INFO:optimus:Using 'column_exp' to process column 'STATE***FINGERPRINT' with function _remove_white_spaces\n", + "INFO:optimus:Using 'pandas_udf' to process column 'STATE***FINGERPRINT' with function calculate_ngrams\n", + "INFO:optimus:Using 'pandas_udf' to process column 'STATE***FINGERPRINT' with function multiple_replace\n", + "INFO:optimus:Using 'pandas_udf' to process column 'STATE***FINGERPRINT' with function _remove_accents\n" +======= + "INFO:optimus:Using 'column_exp' to process column 'STATE_NGRAM' with function _lower\n", + "INFO:optimus:Using 'column_exp' to process column 'STATE_NGRAM' with function _remove_white_spaces\n", + "INFO:optimus:Using 'pandas_udf' to process column 'STATE_NGRAM' with function multiple_replace\n", + "INFO:optimus:Using 'pandas_udf' to process column 'STATE_NGRAM' with function _remove_accents\n", + "INFO:optimus:Using 'column_exp' to process column 'LOCNCODE' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'LOCNDSCR' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'ADDRESS1' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'ADDRESS2' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'ADDRESS3' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'CITY' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'STATE' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'ZIPCODE' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'COUNTRY' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'Location_Segment' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'PAQ' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'TIPUNI' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'Tipo_unidad' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'ITEMNMBR' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'ITMSHNAM' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'MZ' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'LT' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'EDIF' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'NIVEL' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'NOUNI' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'CONDO' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'REGIMEN' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'ETAPA' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'PROTO' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'ITEMDESC' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'NIVELES' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'COCHERA' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'RECAM' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'ALCOB' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'BANOS' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'Num_Balcon' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'SALA' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'COMEDOR' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'COCINA' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'Cuarto_Lavado' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'Cuarto_Servicio' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'OTROX' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'OTROX1' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'SupCons' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'PATIOSERV' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'TERRAZA' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'BALCON' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'AZOTEA' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'Otros' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'AREATOT' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'FRENTE' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'Sup_Terreno' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'EXCEDENTE' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'OTRO1' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'OTRO2' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'TAMANO' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'UBICAVER' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'UBICAHORI' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'QTYONHND_' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'QTYSOLD' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'INACTIVE' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'UOMPRICE' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'MONTOAPA' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'PAGINI' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'ENGANCHE' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'FECHESCRIPRO' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'FECHAENTREGA' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'FECHASALIDAVENTAS' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'LIBERADO_NOLIBERADO' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'ACTIVO_INACTIVO' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'Estatus1Vivienda' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'Estatus2Vivienda' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'CUSTNMBR' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'Nombre_Completo' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cNombre' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cApellidoPaterno' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cApellidoMaterno' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cRfc' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cCurp' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'fkIdGradoInteres' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cSexo' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cEmail' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cTelefonoCasa' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cTelefonoCelular' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cTelefonoTrabajo' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cNumeroSeguroSocial' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'dFechaNacimiento' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cEstadoCivil' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cRegimenConyugal' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cNacionalidad' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cLugarNacimiento' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cRecomendadoPor' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'fkIdMedio' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cMedioContacto' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cCalle' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cNumeroExterior' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cNumeroInterior' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cColonia' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cMunicipio' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cEstado' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cPais' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cCodigoPostal' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'nTiempoResidencia' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cComentario' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cNumeroIdentificacion' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'cTipoIdentificación' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'REFERENCIA' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'FACTURA' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'NOTACR' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'Precio_cierre' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'Precio_cierre_Tot' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'Aumento_al_Contrato' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'Condonacón' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'Precio_Escritura_Total' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'Precio_Dev' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'Precio_Dev_Total' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'Notarios_Proyectados' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'Gatos_A_terceros' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'Depositos' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'Saldo' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'dFechaCreacion' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'dFechaModificacion' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'FECHA_Cotizado' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'FECHA_SolApartado' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'FECHA_AutApartado' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'Vigencia_Apartado' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'FechaVencimientoApartado' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'FECHA_SolDictamen' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'FECHA_ProcDictamen' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'FECHA_DictaminadoLlamada' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'FECHA_DictaminadoFirma' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'FECHA_Dictaminado' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'FECHA_Rechazado' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'FECHA_EscrituraAvaluo' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'FECHA_EscrituraFolio' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'FolioEscsritura' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'FECHA_EscrituraReal' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'FECHA_Cancelado' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'FECHA_Liberado' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'FECHA_Entregado' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'MotivoCancelacion' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'STATE_NGRAM' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'STATE_NGRAM' with function func_col_exp\n", + "INFO:optimus:Using 'pandas_udf' to process column 'STATE_NGRAM_FINGERPRINT' with function remote_white_spaces_remove_sort_join\n" +>>>>>>> Stashed changes + ] + }, + { + "data": { + "text/html": [ + "\n", + "\n", + "\n", + "\n", + "\n", +<<<<<<< Updated upstream + "
Viewing 10 of 10 rows / 137 columns
\n", + "
1 partition(s)
\n", + "\n", + "\n", + " \n", + " \n", + " \n", + "
\n", + "
LOCNCODE
\n", + "
1 (string)
\n", + "
\n", +======= + "
Viewing 10 of 100 rows / 138 columns
\n", + "
1 partition(s)
\n", + "\n", + "\n", + " \n", + " \n", + " \n", + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", +<<<<<<< Updated upstream + " \n", + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", + " \n", + "\n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", +<<<<<<< Updated upstream + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", " \n", " \n", - " \n", - "
\n", + "
LOCNCODE
\n", + "
1 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
LOCNDSCR
\n", + "
2 (string)
\n", + "
\n", +======= + "
\n", + "
LOCNDSCR
\n", + "
2 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
ADDRESS1
\n", + "
3 (string)
\n", + "
\n", +======= + "
\n", + "
ADDRESS1
\n", + "
3 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
ADDRESS2
\n", + "
4 (string)
\n", + "
\n", +======= + "
\n", + "
ADDRESS2
\n", + "
4 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
ADDRESS3
\n", + "
5 (string)
\n", + "
\n", +======= + "
\n", + "
ADDRESS3
\n", + "
5 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
CITY
\n", + "
6 (string)
\n", + "
\n", +======= + "
\n", + "
CITY
\n", + "
6 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
STATE
\n", + "
7 (string)
\n", + "
\n", +======= + "
\n", + "
STATE
\n", + "
7 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
ZIPCODE
\n", + "
8 (string)
\n", + "
\n", +======= + "
\n", + "
ZIPCODE
\n", + "
8 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
COUNTRY
\n", + "
9 (string)
\n", + "
\n", +======= + "
\n", + "
COUNTRY
\n", + "
9 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
Location_Segment
\n", + "
10 (string)
\n", + "
\n", +======= + "
\n", + "
Location_Segment
\n", + "
10 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
PAQ
\n", + "
11 (string)
\n", + "
\n", +======= + "
\n", + "
PAQ
\n", + "
11 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
TIPUNI
\n", + "
12 (string)
\n", + "
\n", +======= + "
\n", + "
TIPUNI
\n", + "
12 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
Tipo_unidad
\n", + "
13 (string)
\n", + "
\n", +======= + "
\n", + "
Tipo_unidad
\n", + "
13 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
ITEMNMBR
\n", + "
14 (string)
\n", + "
\n", +======= + "
\n", + "
ITEMNMBR
\n", + "
14 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
ITMSHNAM
\n", + "
15 (string)
\n", + "
\n", +======= + "
\n", + "
ITMSHNAM
\n", + "
15 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
MZ
\n", + "
16 (string)
\n", + "
\n", +======= + "
\n", + "
MZ
\n", + "
16 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
LT
\n", + "
17 (string)
\n", + "
\n", +======= + "
\n", + "
LT
\n", + "
17 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
EDIF
\n", + "
18 (string)
\n", + "
\n", +======= + "
\n", + "
EDIF
\n", + "
18 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
NIVEL
\n", + "
19 (string)
\n", + "
\n", +======= + "
\n", + "
NIVEL
\n", + "
19 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
NOUNI
\n", + "
20 (string)
\n", + "
\n", +======= + "
\n", + "
NOUNI
\n", + "
20 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
CONDO
\n", + "
21 (string)
\n", + "
\n", +======= + "
\n", + "
CONDO
\n", + "
21 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
REGIMEN
\n", + "
22 (string)
\n", + "
\n", +======= + "
\n", + "
REGIMEN
\n", + "
22 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
ETAPA
\n", + "
23 (string)
\n", + "
\n", +======= + "
\n", + "
ETAPA
\n", + "
23 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
PROTO
\n", + "
24 (string)
\n", + "
\n", +======= + "
\n", + "
PROTO
\n", + "
24 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
ITEMDESC
\n", + "
25 (string)
\n", + "
\n", +======= + "
\n", + "
ITEMDESC
\n", + "
25 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
NIVELES
\n", + "
26 (string)
\n", + "
\n", +======= + "
\n", + "
NIVELES
\n", + "
26 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
COCHERA
\n", + "
27 (string)
\n", + "
\n", +======= + "
\n", + "
COCHERA
\n", + "
27 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
RECAM
\n", + "
28 (string)
\n", + "
\n", +======= + "
\n", + "
RECAM
\n", + "
28 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
ALCOB
\n", + "
29 (string)
\n", + "
\n", +======= + "
\n", + "
ALCOB
\n", + "
29 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
BANOS
\n", + "
30 (string)
\n", + "
\n", +======= + "
\n", + "
BANOS
\n", + "
30 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
Num_Balcon
\n", + "
31 (string)
\n", + "
\n", +======= + "
\n", + "
Num_Balcon
\n", + "
31 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
SALA
\n", + "
32 (string)
\n", + "
\n", +======= + "
\n", + "
SALA
\n", + "
32 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
COMEDOR
\n", + "
33 (string)
\n", + "
\n", +======= + "
\n", + "
COMEDOR
\n", + "
33 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
COCINA
\n", + "
34 (string)
\n", + "
\n", +======= + "
\n", + "
COCINA
\n", + "
34 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
Cuarto_Lavado
\n", + "
35 (string)
\n", + "
\n", +======= + "
\n", + "
Cuarto_Lavado
\n", + "
35 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
Cuarto_Servicio
\n", + "
36 (string)
\n", + "
\n", +======= + "
\n", + "
Cuarto_Servicio
\n", + "
36 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
OTROX
\n", + "
37 (string)
\n", + "
\n", +======= + "
\n", + "
OTROX
\n", + "
37 (string)
\n", + "
\n", + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
OTROX1
\n", + "
38 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
OTROX1
\n", + "
38 (string)
\n", + "
\n", +======= + "
\n", + "
SupCons
\n", + "
39 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
SupCons
\n", + "
39 (string)
\n", + "
\n", +======= + "
\n", + "
PATIOSERV
\n", + "
40 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
PATIOSERV
\n", + "
40 (string)
\n", + "
\n", +======= + "
\n", + "
TERRAZA
\n", + "
41 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
TERRAZA
\n", + "
41 (string)
\n", + "
\n", +======= + "
\n", + "
BALCON
\n", + "
42 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
BALCON
\n", + "
42 (string)
\n", + "
\n", +======= + "
\n", + "
AZOTEA
\n", + "
43 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
AZOTEA
\n", + "
43 (string)
\n", + "
\n", +======= + "
\n", + "
Otros
\n", + "
44 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
Otros
\n", + "
44 (string)
\n", + "
\n", +======= + "
\n", + "
AREATOT
\n", + "
45 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
AREATOT
\n", + "
45 (string)
\n", + "
\n", +======= + "
\n", + "
FRENTE
\n", + "
46 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
FRENTE
\n", + "
46 (string)
\n", + "
\n", +======= + "
\n", + "
Sup_Terreno
\n", + "
47 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
Sup_Terreno
\n", + "
47 (string)
\n", + "
\n", +======= + "
\n", + "
EXCEDENTE
\n", + "
48 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
EXCEDENTE
\n", + "
48 (string)
\n", + "
\n", +======= + "
\n", + "
OTRO1
\n", + "
49 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
OTRO1
\n", + "
49 (string)
\n", + "
\n", +======= + "
\n", + "
OTRO2
\n", + "
50 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
OTRO2
\n", + "
50 (string)
\n", + "
\n", +======= + "
\n", + "
TAMANO
\n", + "
51 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
TAMANO
\n", + "
51 (string)
\n", + "
\n", +======= + "
\n", + "
UBICAVER
\n", + "
52 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
UBICAVER
\n", + "
52 (string)
\n", + "
\n", +======= + "
\n", + "
UBICAHORI
\n", + "
53 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
UBICAHORI
\n", + "
53 (string)
\n", + "
\n", +======= + "
\n", + "
QTYONHND_
\n", + "
54 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
QTYONHND_
\n", + "
54 (string)
\n", + "
\n", +======= + "
\n", + "
QTYSOLD
\n", + "
55 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
QTYSOLD
\n", + "
55 (string)
\n", + "
\n", +======= + "
\n", + "
INACTIVE
\n", + "
56 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
INACTIVE
\n", + "
56 (string)
\n", + "
\n", +======= + "
\n", + "
UOMPRICE
\n", + "
57 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
UOMPRICE
\n", + "
57 (string)
\n", + "
\n", +======= + "
\n", + "
MONTOAPA
\n", + "
58 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
MONTOAPA
\n", + "
58 (string)
\n", + "
\n", +======= + "
\n", + "
PAGINI
\n", + "
59 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
PAGINI
\n", + "
59 (string)
\n", + "
\n", +======= + "
\n", + "
ENGANCHE
\n", + "
60 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
ENGANCHE
\n", + "
60 (string)
\n", + "
\n", +======= + "
\n", + "
FECHESCRIPRO
\n", + "
61 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
FECHESCRIPRO
\n", + "
61 (string)
\n", + "
\n", +======= + "
\n", + "
FECHAENTREGA
\n", + "
62 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
FECHAENTREGA
\n", + "
62 (string)
\n", + "
\n", +======= + "
\n", + "
FECHASALIDAVENTAS
\n", + "
63 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
FECHASALIDAVENTAS
\n", + "
63 (string)
\n", + "
\n", +======= + "
\n", + "
LIBERADO_NOLIBERADO
\n", + "
64 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
LIBERADO_NOLIBERADO
\n", + "
64 (string)
\n", + "
\n", +======= + "
\n", + "
ACTIVO_INACTIVO
\n", + "
65 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
ACTIVO_INACTIVO
\n", + "
65 (string)
\n", + "
\n", +======= + "
\n", + "
Estatus1Vivienda
\n", + "
66 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
Estatus1Vivienda
\n", + "
66 (string)
\n", + "
\n", +======= + "
\n", + "
Estatus2Vivienda
\n", + "
67 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
Estatus2Vivienda
\n", + "
67 (string)
\n", + "
\n", +======= + "
\n", + "
CUSTNMBR
\n", + "
68 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
CUSTNMBR
\n", + "
68 (string)
\n", + "
\n", +======= + "
\n", + "
Nombre_Completo
\n", + "
69 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
Nombre_Completo
\n", + "
69 (string)
\n", + "
\n", +======= + "
\n", + "
cNombre
\n", + "
70 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cNombre
\n", + "
70 (string)
\n", + "
\n", +======= + "
\n", + "
cApellidoPaterno
\n", + "
71 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cApellidoPaterno
\n", + "
71 (string)
\n", + "
\n", +======= + "
\n", + "
cApellidoMaterno
\n", + "
72 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cApellidoMaterno
\n", + "
72 (string)
\n", + "
\n", +======= + "
\n", + "
cRfc
\n", + "
73 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cRfc
\n", + "
73 (string)
\n", + "
\n", +======= + "
\n", + "
cCurp
\n", + "
74 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cCurp
\n", + "
74 (string)
\n", + "
\n", +======= + "
\n", + "
fkIdGradoInteres
\n", + "
75 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
fkIdGradoInteres
\n", + "
75 (string)
\n", + "
\n", +======= + "
\n", + "
cSexo
\n", + "
76 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cSexo
\n", + "
76 (string)
\n", + "
\n", +======= + "
\n", + "
cEmail
\n", + "
77 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cEmail
\n", + "
77 (string)
\n", + "
\n", +======= + "
\n", + "
cTelefonoCasa
\n", + "
78 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cTelefonoCasa
\n", + "
78 (string)
\n", + "
\n", +======= + "
\n", + "
cTelefonoCelular
\n", + "
79 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cTelefonoCelular
\n", + "
79 (string)
\n", + "
\n", +======= + "
\n", + "
cTelefonoTrabajo
\n", + "
80 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cTelefonoTrabajo
\n", + "
80 (string)
\n", + "
\n", +======= + "
\n", + "
cNumeroSeguroSocial
\n", + "
81 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cNumeroSeguroSocial
\n", + "
81 (string)
\n", + "
\n", +======= + "
\n", + "
dFechaNacimiento
\n", + "
82 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
dFechaNacimiento
\n", + "
82 (string)
\n", + "
\n", +======= + "
\n", + "
cEstadoCivil
\n", + "
83 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cEstadoCivil
\n", + "
83 (string)
\n", + "
\n", +======= + "
\n", + "
cRegimenConyugal
\n", + "
84 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cRegimenConyugal
\n", + "
84 (string)
\n", + "
\n", +======= + "
\n", + "
cNacionalidad
\n", + "
85 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cNacionalidad
\n", + "
85 (string)
\n", + "
\n", +======= + "
\n", + "
cLugarNacimiento
\n", + "
86 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cLugarNacimiento
\n", + "
86 (string)
\n", + "
\n", +======= + "
\n", + "
cRecomendadoPor
\n", + "
87 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cRecomendadoPor
\n", + "
87 (string)
\n", + "
\n", +======= + "
\n", + "
fkIdMedio
\n", + "
88 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
fkIdMedio
\n", + "
88 (string)
\n", + "
\n", +======= + "
\n", + "
cMedioContacto
\n", + "
89 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cMedioContacto
\n", + "
89 (string)
\n", + "
\n", +======= + "
\n", + "
cCalle
\n", + "
90 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cCalle
\n", + "
90 (string)
\n", + "
\n", +======= + "
\n", + "
cNumeroExterior
\n", + "
91 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cNumeroExterior
\n", + "
91 (string)
\n", + "
\n", +======= + "
\n", + "
cNumeroInterior
\n", + "
92 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cNumeroInterior
\n", + "
92 (string)
\n", + "
\n", +======= + "
\n", + "
cColonia
\n", + "
93 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cColonia
\n", + "
93 (string)
\n", + "
\n", +======= + "
\n", + "
cMunicipio
\n", + "
94 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cMunicipio
\n", + "
94 (string)
\n", + "
\n", +======= + "
\n", + "
cEstado
\n", + "
95 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cEstado
\n", + "
95 (string)
\n", + "
\n", +======= + "
\n", + "
cPais
\n", + "
96 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cPais
\n", + "
96 (string)
\n", + "
\n", +======= + "
\n", + "
cCodigoPostal
\n", + "
97 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cCodigoPostal
\n", + "
97 (string)
\n", + "
\n", +======= + "
\n", + "
nTiempoResidencia
\n", + "
98 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
nTiempoResidencia
\n", + "
98 (string)
\n", + "
\n", +======= + "
\n", + "
cComentario
\n", + "
99 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cComentario
\n", + "
99 (string)
\n", + "
\n", +======= + "
\n", + "
cNumeroIdentificacion
\n", + "
100 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cNumeroIdentificacion
\n", + "
100 (string)
\n", + "
\n", +======= + "
\n", + "
cTipoIdentificación
\n", + "
101 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
cTipoIdentificación
\n", + "
101 (string)
\n", + "
\n", +======= + "
\n", + "
REFERENCIA
\n", + "
102 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
REFERENCIA
\n", + "
102 (string)
\n", + "
\n", +======= + "
\n", + "
FACTURA
\n", + "
103 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
FACTURA
\n", + "
103 (string)
\n", + "
\n", +======= + "
\n", + "
NOTACR
\n", + "
104 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
NOTACR
\n", + "
104 (string)
\n", + "
\n", +======= + "
\n", + "
Precio_cierre
\n", + "
105 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
Precio_cierre
\n", + "
105 (string)
\n", + "
\n", +======= + "
\n", + "
Precio_cierre_Tot
\n", + "
106 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
Precio_cierre_Tot
\n", + "
106 (string)
\n", + "
\n", +======= + "
\n", + "
Aumento_al_Contrato
\n", + "
107 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
Aumento_al_Contrato
\n", + "
107 (string)
\n", + "
\n", +======= + "
\n", + "
Condonacón
\n", + "
108 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
Condonacón
\n", + "
108 (string)
\n", + "
\n", +======= + "
\n", + "
Precio_Escritura_Total
\n", + "
109 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
Precio_Escritura_Total
\n", + "
109 (string)
\n", + "
\n", +======= + "
\n", + "
Precio_Dev
\n", + "
110 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
Precio_Dev
\n", + "
110 (string)
\n", + "
\n", +======= + "
\n", + "
Precio_Dev_Total
\n", + "
111 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
Precio_Dev_Total
\n", + "
111 (string)
\n", + "
\n", +======= + "
\n", + "
Notarios_Proyectados
\n", + "
112 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
Notarios_Proyectados
\n", + "
112 (string)
\n", + "
\n", +======= + "
\n", + "
Gatos_A_terceros
\n", + "
113 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
Gatos_A_terceros
\n", + "
113 (string)
\n", + "
\n", +======= + "
\n", + "
Depositos
\n", + "
114 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
Depositos
\n", + "
114 (string)
\n", + "
\n", +======= + "
\n", + "
Saldo
\n", + "
115 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
Saldo
\n", + "
115 (string)
\n", + "
\n", +======= + "
\n", + "
dFechaCreacion
\n", + "
116 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
dFechaCreacion
\n", + "
116 (string)
\n", + "
\n", +======= + "
\n", + "
dFechaModificacion
\n", + "
117 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
dFechaModificacion
\n", + "
117 (string)
\n", + "
\n", +======= + "
\n", + "
FECHA_Cotizado
\n", + "
118 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
FECHA_Cotizado
\n", + "
118 (string)
\n", + "
\n", +======= + "
\n", + "
FECHA_SolApartado
\n", + "
119 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
FECHA_SolApartado
\n", + "
119 (string)
\n", + "
\n", +======= + "
\n", + "
FECHA_AutApartado
\n", + "
120 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
FECHA_AutApartado
\n", + "
120 (string)
\n", + "
\n", +======= + "
\n", + "
Vigencia_Apartado
\n", + "
121 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
Vigencia_Apartado
\n", + "
121 (string)
\n", + "
\n", +======= + "
\n", + "
FechaVencimientoApartado
\n", + "
122 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
FechaVencimientoApartado
\n", + "
122 (string)
\n", + "
\n", +======= + " \n", + "
\n", + "
FECHA_SolDictamen
\n", + "
123 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
FECHA_SolDictamen
\n", + "
123 (string)
\n", + "
\n", +======= + "
\n", + "
FECHA_ProcDictamen
\n", + "
124 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
FECHA_ProcDictamen
\n", + "
124 (string)
\n", + "
\n", +======= + "
\n", + "
FECHA_DictaminadoLlamada
\n", + "
125 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
FECHA_DictaminadoLlamada
\n", + "
125 (string)
\n", + "
\n", +======= + "
\n", + "
FECHA_DictaminadoFirma
\n", + "
126 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
FECHA_DictaminadoFirma
\n", + "
126 (string)
\n", + "
\n", +======= + "
\n", + "
FECHA_Dictaminado
\n", + "
127 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
FECHA_Dictaminado
\n", + "
127 (string)
\n", + "
\n", +======= + "
\n", + "
FECHA_Rechazado
\n", + "
128 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
FECHA_Rechazado
\n", + "
128 (string)
\n", + "
\n", +======= + "
\n", + "
FECHA_EscrituraAvaluo
\n", + "
129 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
FECHA_EscrituraAvaluo
\n", + "
129 (string)
\n", + "
\n", +======= + "
\n", + "
FECHA_EscrituraFolio
\n", + "
130 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
FECHA_EscrituraFolio
\n", + "
130 (string)
\n", + "
\n", +======= + "
\n", + "
FolioEscsritura
\n", + "
131 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
FolioEscsritura
\n", + "
131 (string)
\n", + "
\n", +======= + "
\n", + "
FECHA_EscrituraReal
\n", + "
132 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
FECHA_EscrituraReal
\n", + "
132 (string)
\n", + "
\n", +======= + "
\n", + "
FECHA_Cancelado
\n", + "
133 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
FECHA_Cancelado
\n", + "
133 (string)
\n", + "
\n", +======= + "
\n", + "
FECHA_Liberado
\n", + "
134 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
FECHA_Liberado
\n", + "
134 (string)
\n", + "
\n", +======= + "
\n", + "
FECHA_Entregado
\n", + "
135 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
FECHA_Entregado
\n", + "
135 (string)
\n", + "
\n", +======= + "
\n", + "
MotivoCancelacion
\n", + "
136 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
MotivoCancelacion
\n", + "
136 (string)
\n", + "
\n", + " \n", + " nullable\n", +======= + "
\n", + "
STATE_NGRAM
\n", + "
137 (array<string>)
\n", + "
\n", + " \n", + " not nullable\n", +>>>>>>> Stashed changes + " \n", + "
\n", + "
\n", + "
STATE***FINGERPRINT
\n", + "
137 (string)
\n", + "
\n", +======= + "
\n", + "
STATE_NGRAM_FINGERPRINT
\n", + "
138 (string)
\n", + "
\n", +>>>>>>> Stashed changes + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " ALV\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Altos⋅Lindavista\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Guanajuato⋅#⋅85\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " San⋅Bartolo⋅Atepehuacan\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Gustavo⋅A.⋅Madero\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Distrito⋅Federal\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 07730\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Mexico\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0531\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 2\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " ESTACIONAMIENTO\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " ALVV008\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " ALVCDEY0080\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 008\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " EST⋅CDEY\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Cajon⋅virtual\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 2.2\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 2.4\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Chico\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Cajon⋅virtual\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Cajon⋅virtual\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 1\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " NO⋅LIBERADO\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " INACTIVO\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " DISPONIBLE\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 000-DISPONIBLE\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " aldediederfeisitofraristtotr\n", + " \n", +======= + "
\n", + "
ALV\n", + "
\n", + "
\n", + "
Altos⋅Lindavista\n", + "
\n", + "
\n", + "
Guanajuato⋅#⋅85\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
San⋅Bartolo⋅Atepehuacan\n", + "
\n", + "
\n", + "
Gustavo⋅A.⋅Madero\n", + "
\n", + "
\n", + "
Distrito⋅Federal\n", + "
\n", + "
\n", + "
07730\n", + "
\n", + "
\n", + "
Mexico\n", + "
\n", + "
\n", + "
0531\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2\n", + "
\n", + "
\n", + "
ESTACIONAMIENTO\n", + "
\n", + "
\n", + "
ALVV008\n", + "
\n", + "
\n", + "
ALVCDEY0080\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
008\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
EST⋅CDEY\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.2\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.4\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
Chico\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
1\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
NO⋅LIBERADO\n", + "
\n", + "
\n", + "
INACTIVO\n", + "
\n", + "
\n", + "
DISPONIBLE\n", + "
\n", + "
\n", + "
000-DISPONIBLE\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
['distritofederal']\n", + "
\n", + "
\n", + "
\n", +>>>>>>> Stashed changes + "
\n", + "
\n", + "
\n", + " \n", + " ALV\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Altos⋅Lindavista\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Guanajuato⋅#⋅85\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " San⋅Bartolo⋅Atepehuacan\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Gustavo⋅A.⋅Madero\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Distrito⋅Federal\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 07730\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Mexico\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0531\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 2\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " ESTACIONAMIENTO\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " ALVV021\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " ALVCDEY0690\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 069\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " EST⋅CDEY\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Cajon⋅virtual\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 2.2\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 2.4\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Chico\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Cajon⋅virtual\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Cajon⋅virtual\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 1\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " NO⋅LIBERADO\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " INACTIVO\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " DISPONIBLE\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 000-DISPONIBLE\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " aldediederfeisitofraristtotr\n", + " \n", +======= + "
\n", + "
ALV\n", + "
\n", + "
\n", + "
Altos⋅Lindavista\n", + "
\n", + "
\n", + "
Guanajuato⋅#⋅85\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
San⋅Bartolo⋅Atepehuacan\n", + "
\n", + "
\n", + "
Gustavo⋅A.⋅Madero\n", + "
\n", + "
\n", + "
Distrito⋅Federal\n", + "
\n", + "
\n", + "
07730\n", + "
\n", + "
\n", + "
Mexico\n", + "
\n", + "
\n", + "
0531\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2\n", + "
\n", + "
\n", + "
ESTACIONAMIENTO\n", + "
\n", + "
\n", + "
ALVV021\n", + "
\n", + "
\n", + "
ALVCDEY0690\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
069\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
EST⋅CDEY\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.2\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.4\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
Chico\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
1\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
NO⋅LIBERADO\n", + "
\n", + "
\n", + "
INACTIVO\n", + "
\n", + "
\n", + "
DISPONIBLE\n", + "
\n", + "
\n", + "
000-DISPONIBLE\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
['distritofederal']\n", + "
\n", + "
\n", + "
\n", +>>>>>>> Stashed changes "
\n", "
\n", - "\n", - "\n", - "
Viewing 10 of 10 rows / 137 columns
\n", - "
1 partition(s)
\n" - ], - "text/plain": [ - "" - ] - }, - "metadata": {}, - "output_type": "display_data" - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ - "Creating file ../test_df_keycollision.py\n", - "Done\n" - ] - } - ], - "source": [ - "t.create(keyCol, \"fingerprint\", None, \"df\",None, source_df, \"STATE\")\n", - "t.run()" - ] - }, - { - "cell_type": "code", - "execution_count": 73, - "metadata": { - "inputHidden": false, - "outputHidden": false - }, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "Creating test_fingerprint_cluster() test function...\n" - ] - }, - { - "name": "stderr", - "output_type": "stream", - "text": [ - "INFO:optimus:test_fingerprint_cluster()\n", - "INFO:optimus:Using 'column_exp' to process column 'STATE***FINGERPRINT' with function _trim\n", - "INFO:optimus:Using 'column_exp' to process column 'STATE***FINGERPRINT' with function _lower\n", - "INFO:optimus:Using 'pandas_udf' to process column 'STATE***FINGERPRINT' with function multiple_replace\n", - "INFO:optimus:Using 'pandas_udf' to process column 'STATE***FINGERPRINT' with function _remove_accents\n", - "INFO:optimus:Using 'pandas_udf' to process column 'STATE***FINGERPRINT' with function _split_sort_remove_join\n" - ] - }, - { - "name": "stdout", - "output_type": "stream", - "text": [ - "{'Distrito Federal': {'similar': {'Distrito Federal': 10}, 'count': 1, 'sum': 10}}\n" - ] - } - ], - "source": [ - "t.create(keyCol, \"fingerprint_cluster\", None, \"json\", None, source_df, \"STATE\")" - ] - }, - { - "cell_type": "code", - "execution_count": 74, - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "Creating file ../test_df_keycollision.py\n", - "Done\n" - ] - } - ], - "source": [ - "t.run()" - ] - }, - { - "cell_type": "code", - "execution_count": 75, - "metadata": { - "inputHidden": false, - "outputHidden": false - }, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "Creating test_n_gram_fingerprint() test function...\n" - ] - }, - { - "name": "stderr", - "output_type": "stream", - "text": [ - "INFO:optimus:test_n_gram_fingerprint()\n", - "INFO:optimus:Using 'column_exp' to process column 'STATE***FINGERPRINT' with function _lower\n", - "INFO:optimus:Using 'column_exp' to process column 'STATE***FINGERPRINT' with function _remove_white_spaces\n", - "INFO:optimus:Using 'pandas_udf' to process column 'STATE***FINGERPRINT' with function calculate_ngrams\n", - "INFO:optimus:Using 'pandas_udf' to process column 'STATE***FINGERPRINT' with function multiple_replace\n", - "INFO:optimus:Using 'pandas_udf' to process column 'STATE***FINGERPRINT' with function _remove_accents\n" - ] - }, - { - "data": { - "text/html": [ - "\n", - "\n", - "\n", - "\n", - "\n", - "
Viewing 10 of 10 rows / 137 columns
\n", - "
1 partition(s)
\n", - "\n", - "\n", - " \n", " \n", " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", + " \n", + " \n", " \n", - " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", " \n", - "\n", - " \n", - " \n", " \n", " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", " \n", " \n", " \n", @@ -114912,9 +133320,9 @@ " \n", " \n", " \n", @@ -115852,1106 +134260,833 @@ " \n", " aldediederfeisitofraristtotr\n", " \n", +======= + " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", - " \n", - " \n", + " \n", + " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", @@ -116959,6 +135094,7 @@ " \n", " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", " \n", " \n", " \n", @@ -117112,9 +135248,9 @@ " \n", " \n", " \n", @@ -117144,9 +135280,9 @@ " \n", " \n", " \n", @@ -118052,6 +136188,833 @@ " \n", " aldediederfeisitofraristtotr\n", " \n", +======= + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", @@ -118059,6 +137022,7 @@ " \n", " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", " \n", " \n", " \n", @@ -118212,9 +137176,9 @@ " \n", " \n", " \n", @@ -118244,9 +137208,9 @@ " \n", " \n", " \n", @@ -119152,1106 +138116,833 @@ " \n", " aldediederfeisitofraristtotr\n", " \n", +======= + " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", - " \n", - " \n", + " \n", + " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", @@ -120259,6 +138950,7 @@ " \n", " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", " \n", " \n", " \n", @@ -120412,9 +139104,9 @@ " \n", " \n", " \n", @@ -120444,9 +139136,9 @@ " \n", " \n", " \n", @@ -121352,6 +140044,833 @@ " \n", " aldediederfeisitofraristtotr\n", " \n", +======= + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", @@ -121359,6 +140878,7 @@ " \n", " \n", " \n", +<<<<<<< Updated upstream " \n", " \n", " \n", " \n", " \n", @@ -121512,9 +141032,9 @@ " \n", " \n", " \n", @@ -122452,1106 +141972,833 @@ " \n", " aldediederfeisitofraristtotr\n", " \n", +======= + " \n", " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", " \n", - " \n", + " \n", + " \n", " \n", @@ -123559,6 +142806,7 @@ " \n", " \n", " \n", +<<<<<<< Updated upstream " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", @@ -124659,6 +144734,7 @@ " \n", " \n", " \n", +<<<<<<< Updated upstream " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", " \n", @@ -125761,8 +146664,13 @@ "
\n", - "
LOCNCODE
\n", - "
1 (string)
\n", - "
\n", +<<<<<<< Updated upstream + "
\n", + "
\n", " \n", - " nullable\n", + " ALV\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Altos⋅Lindavista\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Guanajuato⋅#⋅85\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " San⋅Bartolo⋅Atepehuacan\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Gustavo⋅A.⋅Madero\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Distrito⋅Federal\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 07730\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Mexico\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0531\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 2\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " ESTACIONAMIENTO\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " ALVV022\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " ALVCDEY0710\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 071\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " EST⋅CDEY\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Cajon⋅virtual\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 2.2\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 2.4\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Chico\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Cajon⋅virtual\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " Cajon⋅virtual\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 1\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " 0\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", + " \n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
LOCNDSCR
\n", - "
2 (string)
\n", - "
\n", - " \n", - " nullable\n", + "
\n", + "
\n", " \n", + " NO⋅LIBERADO\n", + " \n", "
\n", - " \n", + "
\n", - "
ADDRESS1
\n", - "
3 (string)
\n", - "
\n", - " \n", - " nullable\n", + "
\n", + "
\n", " \n", + " INACTIVO\n", + " \n", "
\n", - " \n", + "
\n", - "
ADDRESS2
\n", - "
4 (string)
\n", - "
\n", - " \n", - " nullable\n", + "
\n", + "
\n", " \n", + " DISPONIBLE\n", + " \n", "
\n", - " \n", + "
\n", - "
ADDRESS3
\n", - "
5 (string)
\n", - "
\n", - " \n", - " nullable\n", + "
\n", + "
\n", " \n", + " 000-DISPONIBLE\n", + " \n", "
\n", - " \n", + "
\n", - "
CITY
\n", - "
6 (string)
\n", - "
\n", - " \n", - " nullable\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
STATE
\n", - "
7 (string)
\n", - "
\n", - " \n", - " nullable\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
ZIPCODE
\n", - "
8 (string)
\n", - "
\n", - " \n", - " nullable\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
COUNTRY
\n", - "
9 (string)
\n", - "
\n", - " \n", - " nullable\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
Location_Segment
\n", - "
10 (string)
\n", - "
\n", - " \n", - " nullable\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
PAQ
\n", - "
11 (string)
\n", - "
\n", - " \n", - " nullable\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
TIPUNI
\n", - "
12 (string)
\n", - "
\n", - " \n", - " nullable\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
Tipo_unidad
\n", - "
13 (string)
\n", - "
\n", - " \n", - " nullable\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
ITEMNMBR
\n", - "
14 (string)
\n", - "
\n", - " \n", - " nullable\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
ITMSHNAM
\n", - "
15 (string)
\n", - "
\n", - " \n", - " nullable\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
MZ
\n", - "
16 (string)
\n", - "
\n", - " \n", - " nullable\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
LT
\n", - "
17 (string)
\n", - "
\n", - " \n", - " nullable\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
EDIF
\n", - "
18 (string)
\n", - "
\n", - " \n", - " nullable\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
NIVEL
\n", - "
19 (string)
\n", - "
\n", - " \n", - " nullable\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
NOUNI
\n", - "
20 (string)
\n", - "
\n", - " \n", - " nullable\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
CONDO
\n", - "
21 (string)
\n", - "
\n", - " \n", - " nullable\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
REGIMEN
\n", - "
22 (string)
\n", - "
\n", - " \n", - " nullable\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
ETAPA
\n", - "
23 (string)
\n", - "
\n", - " \n", - " nullable\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
PROTO
\n", - "
24 (string)
\n", - "
\n", - " \n", - " nullable\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
ITEMDESC
\n", - "
25 (string)
\n", - "
\n", - " \n", - " nullable\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
NIVELES
\n", - "
26 (string)
\n", - "
\n", + "
\n", + "
\n", " \n", - " nullable\n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
COCHERA
\n", - "
27 (string)
\n", - "
\n", + "
\n", + "
\n", " \n", - " nullable\n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
RECAM
\n", - "
28 (string)
\n", - "
\n", + "
\n", + "
\n", " \n", - " nullable\n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
ALCOB
\n", - "
29 (string)
\n", - "
\n", + "
\n", + "
\n", " \n", - " nullable\n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
BANOS
\n", - "
30 (string)
\n", - "
\n", + "
\n", + "
\n", " \n", - " nullable\n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
Num_Balcon
\n", - "
31 (string)
\n", - "
\n", + "
\n", + "
\n", " \n", - " nullable\n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
SALA
\n", - "
32 (string)
\n", - "
\n", + "
\n", + "
\n", " \n", - " nullable\n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
COMEDOR
\n", - "
33 (string)
\n", - "
\n", + "
\n", + "
\n", " \n", - " nullable\n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
COCINA
\n", - "
34 (string)
\n", - "
\n", + "
\n", + "
\n", " \n", - " nullable\n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", " \n", + " .00000\n", + " \n", "
\n", - " \n", + "
\n", - "
Cuarto_Lavado
\n", - "
35 (string)
\n", - "
\n", + "
\n", + "
\n", " \n", - " nullable\n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", " \n", + " .00000\n", + " \n", "
\n", - " \n", + "
\n", - "
Cuarto_Servicio
\n", - "
36 (string)
\n", - "
\n", + "
\n", + "
\n", " \n", - " nullable\n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", " \n", + " .00000\n", + " \n", "
\n", - " \n", + "
\n", - "
OTROX
\n", - "
37 (string)
\n", - "
\n", + "
\n", + "
\n", " \n", - " nullable\n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", " \n", + " .00000\n", + " \n", "
\n", - " \n", + "
\n", - "
OTROX1
\n", - "
38 (string)
\n", - "
\n", + "
\n", + "
\n", " \n", - " nullable\n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", " \n", + " .00000\n", + " \n", "
\n", - " \n", + "
\n", - "
SupCons
\n", - "
39 (string)
\n", - "
\n", + "
\n", + "
\n", " \n", - " nullable\n", + " .00000\n", + " \n", + "
\n", + "
\n", + "
\n", " \n", + " .00000\n", + " \n", "
\n", - " \n", + "
\n", - "
PATIOSERV
\n", - "
40 (string)
\n", - "
\n", + "
\n", + "
\n", " \n", - " nullable\n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
TERRAZA
\n", - "
41 (string)
\n", - "
\n", + "
\n", + "
\n", " \n", - " nullable\n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
BALCON
\n", - "
42 (string)
\n", - "
\n", + "
\n", + "
\n", " \n", - " nullable\n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
AZOTEA
\n", - "
43 (string)
\n", - "
\n", + "
\n", + "
\n", " \n", - " nullable\n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
Otros
\n", - "
44 (string)
\n", - "
\n", + "
\n", + "
\n", " \n", - " nullable\n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
AREATOT
\n", - "
45 (string)
\n", - "
\n", + "
\n", + "
\n", " \n", - " nullable\n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
FRENTE
\n", - "
46 (string)
\n", - "
\n", + "
\n", + "
\n", " \n", - " nullable\n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
Sup_Terreno
\n", - "
47 (string)
\n", - "
\n", + "
\n", + "
\n", " \n", - " nullable\n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
EXCEDENTE
\n", - "
48 (string)
\n", - "
\n", + "
\n", + "
\n", " \n", - " nullable\n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
OTRO1
\n", - "
49 (string)
\n", - "
\n", + "
\n", + "
\n", " \n", - " nullable\n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", " \n", + " None\n", + " \n", "
\n", - " \n", + "
\n", - "
OTRO2
\n", - "
50 (string)
\n", - "
\n", + "
\n", + "
\n", " \n", - " nullable\n", + " None\n", + " \n", + "
\n", + "
\n", + "
\n", " \n", + " aldediederfeisitofraristtotr\n", + " \n", +======= + "
\n", + "
ALV\n", "
\n", - " \n", + "
\n", + "
Altos⋅Lindavista\n", + "
\n", + "
\n", + "
Guanajuato⋅#⋅85\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
San⋅Bartolo⋅Atepehuacan\n", + "
\n", + "
\n", + "
Gustavo⋅A.⋅Madero\n", + "
\n", + "
\n", + "
Distrito⋅Federal\n", + "
\n", + "
\n", + "
07730\n", + "
\n", + "
\n", + "
Mexico\n", + "
\n", + "
\n", + "
0531\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2\n", + "
\n", + "
\n", + "
ESTACIONAMIENTO\n", + "
\n", + "
\n", + "
ALVV022\n", + "
\n", + "
\n", + "
ALVCDEY0710\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
071\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
EST⋅CDEY\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.2\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.4\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
Chico\n", + "
\n", + "
\n", - "
TAMANO
\n", - "
51 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
Cajon⋅virtual\n", "
\n", - " \n", + "
\n", - "
UBICAVER
\n", - "
52 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
Cajon⋅virtual\n", "
\n", - " \n", + "
\n", - "
UBICAHORI
\n", - "
53 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
0\n", "
\n", - " \n", + "
\n", - "
QTYONHND_
\n", - "
54 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
0\n", "
\n", - " \n", + "
\n", - "
QTYSOLD
\n", - "
55 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
1\n", "
\n", - " \n", + "
\n", - "
INACTIVE
\n", - "
56 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
0\n", "
\n", - " \n", + "
\n", - "
UOMPRICE
\n", - "
57 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
MONTOAPA
\n", - "
58 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
PAGINI
\n", - "
59 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
ENGANCHE
\n", - "
60 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
FECHESCRIPRO
\n", - "
61 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
FECHAENTREGA
\n", - "
62 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
FECHASALIDAVENTAS
\n", - "
63 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
NO⋅LIBERADO\n", "
\n", - " \n", + "
\n", - "
LIBERADO_NOLIBERADO
\n", - "
64 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
INACTIVO\n", "
\n", - " \n", + "
\n", - "
ACTIVO_INACTIVO
\n", - "
65 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
DISPONIBLE\n", "
\n", - " \n", + "
\n", - "
Estatus1Vivienda
\n", - "
66 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
000-DISPONIBLE\n", "
\n", - " \n", + "
\n", - "
Estatus2Vivienda
\n", - "
67 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
CUSTNMBR
\n", - "
68 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
Nombre_Completo
\n", - "
69 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cNombre
\n", - "
70 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cApellidoPaterno
\n", - "
71 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cApellidoMaterno
\n", - "
72 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cRfc
\n", - "
73 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cCurp
\n", - "
74 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
fkIdGradoInteres
\n", - "
75 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cSexo
\n", - "
76 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cEmail
\n", - "
77 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cTelefonoCasa
\n", - "
78 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cTelefonoCelular
\n", - "
79 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cTelefonoTrabajo
\n", - "
80 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cNumeroSeguroSocial
\n", - "
81 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
dFechaNacimiento
\n", - "
82 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cEstadoCivil
\n", - "
83 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cRegimenConyugal
\n", - "
84 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cNacionalidad
\n", - "
85 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cLugarNacimiento
\n", - "
86 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cRecomendadoPor
\n", - "
87 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
fkIdMedio
\n", - "
88 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cMedioContacto
\n", - "
89 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cCalle
\n", - "
90 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cNumeroExterior
\n", - "
91 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cNumeroInterior
\n", - "
92 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cColonia
\n", - "
93 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cMunicipio
\n", - "
94 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cEstado
\n", - "
95 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cPais
\n", - "
96 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cCodigoPostal
\n", - "
97 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
nTiempoResidencia
\n", - "
98 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cComentario
\n", - "
99 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cNumeroIdentificacion
\n", - "
100 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
cTipoIdentificación
\n", - "
101 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
REFERENCIA
\n", - "
102 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
FACTURA
\n", - "
103 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
NOTACR
\n", - "
104 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
.00000\n", "
\n", - " \n", + "
\n", - "
Precio_cierre
\n", - "
105 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
.00000\n", "
\n", - " \n", + "
\n", - "
Precio_cierre_Tot
\n", - "
106 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
.00000\n", "
\n", - " \n", + "
\n", - "
Aumento_al_Contrato
\n", - "
107 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
.00000\n", "
\n", - " \n", + "
\n", - "
Condonacón
\n", - "
108 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
.00000\n", "
\n", - " \n", + "
\n", - "
Precio_Escritura_Total
\n", - "
109 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
.00000\n", "
\n", - " \n", + "
\n", - "
Precio_Dev
\n", - "
110 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
.00000\n", "
\n", - " \n", + "
\n", - "
Precio_Dev_Total
\n", - "
111 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
.00000\n", "
\n", - " \n", + "
\n", - "
Notarios_Proyectados
\n", - "
112 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
.00000\n", "
\n", - " \n", + "
\n", - "
Gatos_A_terceros
\n", - "
113 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
.00000\n", "
\n", - " \n", + "
\n", - "
Depositos
\n", - "
114 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
.00000\n", "
\n", - " \n", + "
\n", - "
Saldo
\n", - "
115 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
dFechaCreacion
\n", - "
116 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
dFechaModificacion
\n", - "
117 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
FECHA_Cotizado
\n", - "
118 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
FECHA_SolApartado
\n", - "
119 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
FECHA_AutApartado
\n", - "
120 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
Vigencia_Apartado
\n", - "
121 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
FechaVencimientoApartado
\n", - "
122 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
FECHA_SolDictamen
\n", - "
123 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
FECHA_ProcDictamen
\n", - "
124 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
FECHA_DictaminadoLlamada
\n", - "
125 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
FECHA_DictaminadoFirma
\n", - "
126 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
FECHA_Dictaminado
\n", - "
127 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
FECHA_Rechazado
\n", - "
128 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
FECHA_EscrituraAvaluo
\n", - "
129 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
FECHA_EscrituraFolio
\n", - "
130 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
FolioEscsritura
\n", - "
131 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
FECHA_EscrituraReal
\n", - "
132 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
FECHA_Cancelado
\n", - "
133 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
FECHA_Liberado
\n", - "
134 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
FECHA_Entregado
\n", - "
135 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
None\n", "
\n", - " \n", + "
\n", - "
MotivoCancelacion
\n", - "
136 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
['distritofederal']\n", "
\n", - " \n", + "
\n", - "
STATE***FINGERPRINT
\n", - "
137 (string)
\n", - "
\n", - " \n", - " nullable\n", - " \n", + "
\n", + "
\n", +>>>>>>> Stashed changes "
\n", - " \n", + "
\n", "
\n", " \n", @@ -114864,17 +133272,17 @@ "
\n", - "
\n", + "
\n", " \n", - " ALVV008\n", + " ALVV027\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " ALVCDEY0080\n", + " ALVCDEY0810\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " 008\n", + " 081\n", " \n", "
\n", "
\n", + "
ALV\n", "
\n", "
\n", - "
\n", - " \n", - " ALV\n", - " \n", + "
\n", + "
Altos⋅Lindavista\n", "
\n", "
\n", - "
\n", - " \n", - " Altos⋅Lindavista\n", - " \n", + "
\n", + "
Guanajuato⋅#⋅85\n", "
\n", "
\n", - "
\n", - " \n", - " Guanajuato⋅#⋅85\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
San⋅Bartolo⋅Atepehuacan\n", "
\n", "
\n", - "
\n", - " \n", - " San⋅Bartolo⋅Atepehuacan\n", - " \n", + "
\n", + "
Gustavo⋅A.⋅Madero\n", "
\n", "
\n", - "
\n", - " \n", - " Gustavo⋅A.⋅Madero\n", - " \n", + "
\n", + "
Distrito⋅Federal\n", "
\n", "
\n", - "
\n", - " \n", - " Distrito⋅Federal\n", - " \n", + "
\n", + "
07730\n", "
\n", "
\n", - "
\n", - " \n", - " 07730\n", - " \n", + "
\n", + "
Mexico\n", "
\n", "
\n", - "
\n", - " \n", - " Mexico\n", - " \n", + "
\n", + "
0531\n", "
\n", "
\n", - "
\n", - " \n", - " 0531\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
2\n", "
\n", "
\n", - "
\n", - " \n", - " 2\n", - " \n", + "
\n", + "
ESTACIONAMIENTO\n", "
\n", "
\n", - "
\n", - " \n", - " ESTACIONAMIENTO\n", - " \n", + "
\n", + "
ALVV027\n", "
\n", "
\n", - "
\n", - " \n", - " ALVV021\n", - " \n", + "
\n", + "
ALVCDEY0810\n", "
\n", "
\n", - "
\n", - " \n", - " ALVCDEY0690\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
081\n", "
\n", "
\n", - "
\n", - " \n", - " 069\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
EST⋅CDEY\n", "
\n", "
\n", - "
\n", - " \n", - " EST⋅CDEY\n", - " \n", + "
\n", + "
Cajon⋅virtual\n", "
\n", "
\n", - "
\n", - " \n", - " Cajon⋅virtual\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
2.2\n", "
\n", "
\n", - "
\n", - " \n", - " 2.2\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
2.4\n", "
\n", "
\n", - "
\n", - " \n", - " 2.4\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
Chico\n", "
\n", "
\n", - "
\n", - " \n", - " Chico\n", - " \n", + "
\n", + "
Cajon⋅virtual\n", "
\n", "
\n", - "
\n", - " \n", - " Cajon⋅virtual\n", - " \n", + "
\n", + "
Cajon⋅virtual\n", "
\n", "
\n", - "
\n", - " \n", - " Cajon⋅virtual\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
1\n", "
\n", "
\n", - "
\n", - " \n", - " 1\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
NO⋅LIBERADO\n", "
\n", "
\n", - "
\n", - " \n", - " NO⋅LIBERADO\n", - " \n", + "
\n", + "
INACTIVO\n", "
\n", "
\n", - "
\n", - " \n", - " INACTIVO\n", - " \n", + "
\n", + "
DISPONIBLE\n", "
\n", "
\n", - "
\n", - " \n", - " DISPONIBLE\n", - " \n", + "
\n", + "
000-DISPONIBLE\n", "
\n", "
\n", - "
\n", - " \n", - " 000-DISPONIBLE\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", - "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
['distritofederal']\n", "
\n", "
\n", - "
\n", - " \n", - " aldediederfeisitofraristtotr\n", - " \n", + "
\n", + "
\n", +>>>>>>> Stashed changes "
\n", "
\n", "
\n", " \n", @@ -117064,17 +135200,17 @@ "
\n", - "
\n", + "
\n", " \n", - " ALVV022\n", + " ALVV032\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " ALVCDEY0710\n", + " ALVCEEY0090\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " 071\n", + " 009\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " EST⋅CDEY\n", + " EST⋅CEEY\n", " \n", "
\n", "
\n", + "
ALV\n", + "
\n", + "
\n", + "
Altos⋅Lindavista\n", + "
\n", + "
\n", + "
Guanajuato⋅#⋅85\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
San⋅Bartolo⋅Atepehuacan\n", + "
\n", + "
\n", + "
Gustavo⋅A.⋅Madero\n", + "
\n", + "
\n", + "
Distrito⋅Federal\n", + "
\n", + "
\n", + "
07730\n", + "
\n", + "
\n", + "
Mexico\n", + "
\n", + "
\n", + "
0531\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2\n", + "
\n", + "
\n", + "
ESTACIONAMIENTO\n", + "
\n", + "
\n", + "
ALVV032\n", + "
\n", + "
\n", + "
ALVCEEY0090\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
009\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
EST⋅CEEY\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.2\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.4\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
Chico\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
1\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
NO⋅LIBERADO\n", + "
\n", + "
\n", + "
INACTIVO\n", + "
\n", + "
\n", + "
DISPONIBLE\n", + "
\n", + "
\n", + "
000-DISPONIBLE\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
['distritofederal']\n", + "
\n", + "
\n", + "
\n", +>>>>>>> Stashed changes "
\n", "
\n", "
\n", " \n", @@ -118164,17 +137128,17 @@ "
\n", - "
\n", + "
\n", " \n", - " ALVV027\n", + " ALVV035\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " ALVCDEY0810\n", + " ALVCEEY0150\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " 081\n", + " 015\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " EST⋅CDEY\n", + " EST⋅CEEY\n", " \n", "
\n", "
\n", + "
ALV\n", "
\n", "
\n", - "
\n", - " \n", - " ALV\n", - " \n", + "
\n", + "
Altos⋅Lindavista\n", "
\n", "
\n", - "
\n", - " \n", - " Altos⋅Lindavista\n", - " \n", + "
\n", + "
Guanajuato⋅#⋅85\n", "
\n", "
\n", - "
\n", - " \n", - " Guanajuato⋅#⋅85\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
San⋅Bartolo⋅Atepehuacan\n", "
\n", "
\n", - "
\n", - " \n", - " San⋅Bartolo⋅Atepehuacan\n", - " \n", + "
\n", + "
Gustavo⋅A.⋅Madero\n", "
\n", "
\n", - "
\n", - " \n", - " Gustavo⋅A.⋅Madero\n", - " \n", + "
\n", + "
Distrito⋅Federal\n", "
\n", "
\n", - "
\n", - " \n", - " Distrito⋅Federal\n", - " \n", + "
\n", + "
07730\n", "
\n", "
\n", - "
\n", - " \n", - " 07730\n", - " \n", + "
\n", + "
Mexico\n", "
\n", "
\n", - "
\n", - " \n", - " Mexico\n", - " \n", + "
\n", + "
0531\n", "
\n", "
\n", - "
\n", - " \n", - " 0531\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
2\n", "
\n", "
\n", - "
\n", - " \n", - " 2\n", - " \n", + "
\n", + "
ESTACIONAMIENTO\n", "
\n", "
\n", - "
\n", - " \n", - " ESTACIONAMIENTO\n", - " \n", + "
\n", + "
ALVV035\n", "
\n", "
\n", - "
\n", - " \n", - " ALVV032\n", - " \n", + "
\n", + "
ALVCEEY0150\n", "
\n", "
\n", - "
\n", - " \n", - " ALVCEEY0090\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
015\n", "
\n", "
\n", - "
\n", - " \n", - " 009\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
EST⋅CEEY\n", "
\n", "
\n", - "
\n", - " \n", - " EST⋅CEEY\n", - " \n", + "
\n", + "
Cajon⋅virtual\n", "
\n", "
\n", - "
\n", - " \n", - " Cajon⋅virtual\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
2.2\n", "
\n", "
\n", - "
\n", - " \n", - " 2.2\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
2.4\n", "
\n", "
\n", - "
\n", - " \n", - " 2.4\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
Chico\n", "
\n", "
\n", - "
\n", - " \n", - " Chico\n", - " \n", + "
\n", + "
Cajon⋅virtual\n", "
\n", "
\n", - "
\n", - " \n", - " Cajon⋅virtual\n", - " \n", + "
\n", + "
Cajon⋅virtual\n", "
\n", "
\n", - "
\n", - " \n", - " Cajon⋅virtual\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
1\n", "
\n", "
\n", - "
\n", - " \n", - " 1\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
NO⋅LIBERADO\n", "
\n", "
\n", - "
\n", - " \n", - " NO⋅LIBERADO\n", - " \n", + "
\n", + "
INACTIVO\n", "
\n", "
\n", - "
\n", - " \n", - " INACTIVO\n", - " \n", + "
\n", + "
DISPONIBLE\n", "
\n", "
\n", - "
\n", - " \n", - " DISPONIBLE\n", - " \n", + "
\n", + "
000-DISPONIBLE\n", "
\n", "
\n", - "
\n", - " \n", - " 000-DISPONIBLE\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", - "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
['distritofederal']\n", "
\n", "
\n", - "
\n", - " \n", - " aldediederfeisitofraristtotr\n", - " \n", + "
\n", + "
\n", +>>>>>>> Stashed changes "
\n", "
\n", "
\n", " \n", @@ -120364,17 +139056,17 @@ "
\n", - "
\n", + "
\n", " \n", - " ALVV035\n", + " ALVV009\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " ALVCEEY0150\n", + " ALVCDEY0100\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " 015\n", + " 010\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " EST⋅CEEY\n", + " EST⋅CDEY\n", " \n", "
\n", "
\n", + "
ALV\n", + "
\n", + "
\n", + "
Altos⋅Lindavista\n", + "
\n", + "
\n", + "
Guanajuato⋅#⋅85\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
San⋅Bartolo⋅Atepehuacan\n", + "
\n", + "
\n", + "
Gustavo⋅A.⋅Madero\n", + "
\n", + "
\n", + "
Distrito⋅Federal\n", + "
\n", + "
\n", + "
07730\n", + "
\n", + "
\n", + "
Mexico\n", + "
\n", + "
\n", + "
0531\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2\n", + "
\n", + "
\n", + "
ESTACIONAMIENTO\n", + "
\n", + "
\n", + "
ALVV009\n", + "
\n", + "
\n", + "
ALVCDEY0100\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
010\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
EST⋅CDEY\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.2\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.4\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
Chico\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
1\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
NO⋅LIBERADO\n", + "
\n", + "
\n", + "
INACTIVO\n", + "
\n", + "
\n", + "
DISPONIBLE\n", + "
\n", + "
\n", + "
000-DISPONIBLE\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
['distritofederal']\n", + "
\n", + "
\n", + "
\n", +>>>>>>> Stashed changes "
\n", "
\n", "
\n", " \n", @@ -121464,17 +140984,17 @@ "
\n", - "
\n", + "
\n", " \n", - " ALVV009\n", + " ALVV012\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " ALVCDEY0100\n", + " ALVCDEY0160\n", " \n", "
\n", "
\n", - "
\n", + "
\n", " \n", - " 010\n", + " 016\n", " \n", "
\n", "
\n", + "
ALV\n", "
\n", "
\n", - "
\n", - " \n", - " ALV\n", - " \n", - "
\n", - "
\n", - "
\n", - " \n", - " Altos⋅Lindavista\n", - " \n", + "
\n", + "
Altos⋅Lindavista\n", "
\n", "
\n", - "
\n", - " \n", - " Guanajuato⋅#⋅85\n", - " \n", + "
\n", + "
Guanajuato⋅#⋅85\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " San⋅Bartolo⋅Atepehuacan\n", - " \n", + "
\n", + "
San⋅Bartolo⋅Atepehuacan\n", "
\n", "
\n", - "
\n", - " \n", - " Gustavo⋅A.⋅Madero\n", - " \n", + "
\n", + "
Gustavo⋅A.⋅Madero\n", "
\n", "
\n", - "
\n", - " \n", - " Distrito⋅Federal\n", - " \n", + "
\n", + "
Distrito⋅Federal\n", "
\n", "
\n", - "
\n", - " \n", - " 07730\n", - " \n", + "
\n", + "
07730\n", "
\n", "
\n", - "
\n", - " \n", - " Mexico\n", - " \n", + "
\n", + "
Mexico\n", "
\n", "
\n", - "
\n", - " \n", - " 0531\n", - " \n", + "
\n", + "
0531\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " 2\n", - " \n", + "
\n", + "
2\n", "
\n", "
\n", - "
\n", - " \n", - " ESTACIONAMIENTO\n", - " \n", + "
\n", + "
ESTACIONAMIENTO\n", "
\n", "
\n", - "
\n", - " \n", - " ALVV012\n", - " \n", + "
\n", + "
ALVV012\n", "
\n", "
\n", - "
\n", - " \n", - " ALVCDEY0160\n", - " \n", + "
\n", + "
ALVCDEY0160\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " 016\n", - " \n", + "
\n", + "
016\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " EST⋅CDEY\n", - " \n", + "
\n", + "
EST⋅CDEY\n", "
\n", "
\n", - "
\n", - " \n", - " Cajon⋅virtual\n", - " \n", + "
\n", + "
Cajon⋅virtual\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " 2.2\n", - " \n", + "
\n", + "
2.2\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " 2.4\n", - " \n", + "
\n", + "
2.4\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " Chico\n", - " \n", + "
\n", + "
Chico\n", "
\n", "
\n", - "
\n", - " \n", - " Cajon⋅virtual\n", - " \n", + "
\n", + "
Cajon⋅virtual\n", "
\n", "
\n", - "
\n", - " \n", - " Cajon⋅virtual\n", - " \n", + "
\n", + "
Cajon⋅virtual\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " 1\n", - " \n", + "
\n", + "
1\n", "
\n", "
\n", - "
\n", - " \n", - " 0\n", - " \n", + "
\n", + "
0\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " NO⋅LIBERADO\n", - " \n", + "
\n", + "
NO⋅LIBERADO\n", "
\n", "
\n", - "
\n", - " \n", - " INACTIVO\n", - " \n", + "
\n", + "
INACTIVO\n", "
\n", "
\n", - "
\n", - " \n", - " DISPONIBLE\n", - " \n", + "
\n", + "
DISPONIBLE\n", "
\n", "
\n", - "
\n", - " \n", - " 000-DISPONIBLE\n", - " \n", + "
\n", + "
000-DISPONIBLE\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " .00000\n", - " \n", + "
\n", + "
.00000\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " None\n", - " \n", + "
\n", + "
None\n", "
\n", "
\n", - "
\n", - " \n", - " aldediederfeisitofraristtotr\n", - " \n", + "
\n", + "
['distritofederal']\n", + "
\n", + "
\n", + "
\n", +>>>>>>> Stashed changes "
\n", "
\n", "
\n", " \n", @@ -124652,6 +143900,833 @@ " \n", " aldediederfeisitofraristtotr\n", " \n", +======= + "
\n", + "
ALV\n", + "
\n", + "
\n", + "
Altos⋅Lindavista\n", + "
\n", + "
\n", + "
Guanajuato⋅#⋅85\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
San⋅Bartolo⋅Atepehuacan\n", + "
\n", + "
\n", + "
Gustavo⋅A.⋅Madero\n", + "
\n", + "
\n", + "
Distrito⋅Federal\n", + "
\n", + "
\n", + "
07730\n", + "
\n", + "
\n", + "
Mexico\n", + "
\n", + "
\n", + "
0531\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2\n", + "
\n", + "
\n", + "
ESTACIONAMIENTO\n", + "
\n", + "
\n", + "
ALVV019\n", + "
\n", + "
\n", + "
ALVCDEY0650\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
065\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
EST⋅CDEY\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.2\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.4\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
Chico\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
1\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
NO⋅LIBERADO\n", + "
\n", + "
\n", + "
INACTIVO\n", + "
\n", + "
\n", + "
DISPONIBLE\n", + "
\n", + "
\n", + "
000-DISPONIBLE\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
['distritofederal']\n", + "
\n", + "
\n", + "
\n", +>>>>>>> Stashed changes "
\n", "
\n", "
\n", " \n", @@ -125752,6 +145828,833 @@ " \n", " aldediederfeisitofraristtotr\n", " \n", +======= + "
\n", + "
ALV\n", + "
\n", + "
\n", + "
Altos⋅Lindavista\n", + "
\n", + "
\n", + "
Guanajuato⋅#⋅85\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
San⋅Bartolo⋅Atepehuacan\n", + "
\n", + "
\n", + "
Gustavo⋅A.⋅Madero\n", + "
\n", + "
\n", + "
Distrito⋅Federal\n", + "
\n", + "
\n", + "
07730\n", + "
\n", + "
\n", + "
Mexico\n", + "
\n", + "
\n", + "
0531\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2\n", + "
\n", + "
\n", + "
ESTACIONAMIENTO\n", + "
\n", + "
\n", + "
ALVV044\n", + "
\n", + "
\n", + "
ALVCUEY0340\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
034\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
EST⋅CUEY\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.2\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
2.4\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
Chico\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
Cajon⋅virtual\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
1\n", + "
\n", + "
\n", + "
0\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
NO⋅LIBERADO\n", + "
\n", + "
\n", + "
INACTIVO\n", + "
\n", + "
\n", + "
DISPONIBLE\n", + "
\n", + "
\n", + "
000-DISPONIBLE\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
.00000\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
None\n", + "
\n", + "
\n", + "
['distritofederal']\n", + "
\n", + "
\n", + "
\n", +>>>>>>> Stashed changes "
\n", "
\n", "\n", "\n", +<<<<<<< Updated upstream "
Viewing 10 of 10 rows / 137 columns
\n", "
1 partition(s)
\n" +======= + "
Viewing 10 of 100 rows / 138 columns
\n", + "
1 partition(s)
\n" +>>>>>>> Stashed changes ], "text/plain": [ "" @@ -125778,7 +146686,11 @@ }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 76, +======= + "execution_count": 198, +>>>>>>> Stashed changes "metadata": { "inputHidden": false, "outputHidden": false @@ -125796,6 +146708,7 @@ "output_type": "stream", "text": [ "INFO:optimus:test_n_gram_fingerprint_cluster()\n", +<<<<<<< Updated upstream "INFO:optimus:Using 'column_exp' to process column 'STATE***FINGERPRINT' with function _lower\n", "INFO:optimus:Using 'column_exp' to process column 'STATE***FINGERPRINT' with function _remove_white_spaces\n", "INFO:optimus:Using 'pandas_udf' to process column 'STATE***FINGERPRINT' with function calculate_ngrams\n", @@ -125813,11 +146726,133 @@ ], "source": [ "t.create(keyCol, \"n_gram_fingerprint_cluster\", None, \"json\", None, source_df, \"STATE\", 2)" +======= + "INFO:optimus:Using 'column_exp' to process column 'STATE_NGRAM' with function _lower\n", + "INFO:optimus:Using 'column_exp' to process column 'STATE_NGRAM' with function _remove_white_spaces\n", + "INFO:optimus:Using 'pandas_udf' to process column 'STATE_NGRAM' with function multiple_replace\n", + "INFO:optimus:Using 'pandas_udf' to process column 'STATE_NGRAM' with function _remove_accents\n", + "INFO:optimus:Using 'column_exp' to process column 'count' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'STATE' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'STATE_NGRAM' with function _cast_to\n", + "INFO:optimus:Using 'column_exp' to process column 'STATE_NGRAM' with function func_col_exp\n", + "INFO:optimus:Using 'pandas_udf' to process column 'STATE_NGRAM_FINGERPRINT' with function remote_white_spaces_remove_sort_join\n" + ] + }, + { + "data": { + "text/html": [ + "\n", + "\n", + "\n", + "\n", + "\n", + "
Viewing 1 of 1 rows / 4 columns
\n", + "
200 partition(s)
\n", + "\n", + "\n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + "\n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + "
\n", + "
STATE_CLUSTER_SIZE
\n", + "
1 (int)
\n", + "
\n", + " \n", + " not nullable\n", + " \n", + "
\n", + "
\n", + "
STATE_CLUSTER
\n", + "
2 (array<string>)
\n", + "
\n", + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
STATE_COUNT
\n", + "
3 (double)
\n", + "
\n", + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
STATE_RECOMMENDED
\n", + "
4 (string)
\n", + "
\n", + " \n", + " nullable\n", + " \n", + "
\n", + "
\n", + "
1\n", + "
\n", + "
\n", + "
['Distrito⋅Federal']\n", + "
\n", + "
\n", + "
100.0\n", + "
\n", + "
\n", + "
Distrito⋅Federal\n", + "
\n", + "
\n", + "\n", + "\n", + "
Viewing 1 of 1 rows / 4 columns
\n", + "
200 partition(s)
\n" + ], + "text/plain": [ + "" + ] + }, + "metadata": {}, + "output_type": "display_data" + } + ], + "source": [ + "t.create(keyCol, \"n_gram_fingerprint_cluster\", None, \"df\", None, source_df, \"STATE\", 2)" +>>>>>>> Stashed changes ] }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 77, +======= + "execution_count": 199, +>>>>>>> Stashed changes "metadata": { "inputHidden": false, "outputHidden": false @@ -125845,7 +146880,11 @@ }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 63, +======= + "execution_count": 33, +>>>>>>> Stashed changes "metadata": {}, "outputs": [], "source": [ @@ -125854,7 +146893,11 @@ }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 64, +======= + "execution_count": 34, +>>>>>>> Stashed changes "metadata": { "inputHidden": false, "outputHidden": false @@ -125873,7 +146916,11 @@ }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 65, +======= + "execution_count": 35, +>>>>>>> Stashed changes "metadata": {}, "outputs": [ { @@ -138197,7 +159244,11 @@ }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 66, +======= + "execution_count": 37, +>>>>>>> Stashed changes "metadata": { "inputHidden": false, "outputHidden": false @@ -138236,7 +159287,11 @@ }, { "cell_type": "code", +<<<<<<< Updated upstream "execution_count": 69, +======= + "execution_count": 38, +>>>>>>> Stashed changes "metadata": {}, "outputs": [ {