From 9df1162f2256125fc87cb28b6aa27eb54c38e742 Mon Sep 17 00:00:00 2001
From: KVSRoyal <korianns@ymail.com>
Date: Thu, 2 May 2019 23:14:49 -0600
Subject: [PATCH] Revenue Adjustments Update

- Attempted to remove all school districts in our data that are not in the edbuild data
---
 .idea/workspace.xml                           | 151 +++++++++++-------
 .../edbuild_district_data.cpython-37.pyc      | Bin 4201 -> 4344 bytes
 .../edbuild_data/edbuild_district_data.py     |  18 ++-
 funding_analysis/revenue_adjustments.py       |  64 +++++---
 4 files changed, 154 insertions(+), 79 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a6afa16..2d1697c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,19 +5,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="5180e3e9-8261-46ec-95f3-6cade733a10f" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/resources/raw_f33_data/districtnumberinfo.xls" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/funding_analysis/edbuild_district_data.py" beforeDir="false" afterPath="$PROJECT_DIR$/funding_analysis/edbuild_data/edbuild_district_data.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/funding_analysis/find_description.py" beforeDir="false" afterPath="$PROJECT_DIR$/funding_analysis/examples/find_description.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/funding_analysis/loading_data.py" beforeDir="false" afterPath="$PROJECT_DIR$/funding_analysis/examples/loading_data.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/funding_analysis/print_all_f33_data.py" beforeDir="false" afterPath="$PROJECT_DIR$/funding_analysis/f33_data/print_all_f33_data.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/funding_analysis/relevant_data_f33.py" beforeDir="false" afterPath="$PROJECT_DIR$/funding_analysis/f33_data/relevant_data_f33.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/funding_analysis/edbuild_data/edbuild_district_data.py" beforeDir="false" afterPath="$PROJECT_DIR$/funding_analysis/edbuild_data/edbuild_district_data.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/funding_analysis/revenue_adjustments.py" beforeDir="false" afterPath="$PROJECT_DIR$/funding_analysis/revenue_adjustments.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/funding_analysis/selecting_f33_data.py" beforeDir="false" afterPath="$PROJECT_DIR$/funding_analysis/examples/selecting_f33_data.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/descriptions.xls" beforeDir="false" afterPath="$PROJECT_DIR$/resources/raw_f33_data/descriptions.xls" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/raw_data/data_flags1.xls" beforeDir="false" afterPath="$PROJECT_DIR$/resources/raw_f33_data/data_flags1.xls" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/raw_data/data_flags2.xls" beforeDir="false" afterPath="$PROJECT_DIR$/resources/raw_f33_data/data_flags2.xls" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/raw_data/nonexhibit_items.xls" beforeDir="false" afterPath="$PROJECT_DIR$/resources/raw_f33_data/nonexhibit_items.xls" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/raw_data/relevant_raw_data.xls" beforeDir="false" afterPath="$PROJECT_DIR$/resources/raw_f33_data/relevant_raw_data.xls" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resources/districtnumberinfo.xls" beforeDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -31,7 +23,7 @@
         <entry file="file://$PROJECT_DIR$/funding_analysis/f33_data/print_all_f33_data.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="204">
-              <caret line="13" column="35" lean-forward="true" selection-start-line="13" selection-start-column="35" selection-end-line="13" selection-end-column="35" />
+              <caret line="13" column="52" selection-start-line="13" selection-start-column="52" selection-end-line="13" selection-end-column="52" />
             </state>
           </provider>
         </entry>
@@ -39,8 +31,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/funding_analysis/f33_data/relevant_data_f33.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="204">
-              <caret line="27" column="60" lean-forward="true" selection-start-line="27" selection-start-column="60" selection-end-line="27" selection-end-column="60" />
+            <state relative-caret-position="187">
+              <caret line="74" column="11" lean-forward="true" selection-start-line="74" selection-start-column="11" selection-end-line="74" selection-end-column="11" />
               <folding>
                 <element signature="e#84#98#0" expanded="true" />
               </folding>
@@ -51,8 +43,35 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/funding_analysis/revenue_adjustments.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="694">
-              <caret line="94" lean-forward="true" selection-start-line="94" selection-end-line="94" />
+            <state relative-caret-position="-297">
+              <caret line="79" column="76" lean-forward="true" selection-start-line="79" selection-start-column="76" selection-end-line="79" selection-end-column="76" />
+              <folding>
+                <element signature="e#118#186#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/funding_analysis/edbuild_data/edbuild_district_data.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="204">
+              <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+              <folding>
+                <element signature="e#96#110#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/funding_analysis/cleaning2.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="204">
+              <caret line="12" selection-start-line="12" selection-end-line="12" />
+              <folding>
+                <element signature="e#0#18#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -74,10 +93,8 @@
       <find>local</find>
       <find>cha</find>
       <find>district</find>
-      <find>sch</find>
       <find>lev</find>
       <find>schlev</find>
-      <find>num</find>
       <find>expenditure</find>
       <find>charter</find>
       <find>TFEd</find>
@@ -85,13 +102,18 @@
       <find>v92</find>
       <find>total</find>
       <find>student</find>
-      <find>number</find>
       <find>scho</find>
       <find>oper</find>
-      <find>schools</find>
       <find>enroll</find>
       <find>fall membership</find>
       <find>st</find>
+      <find>schools</find>
+      <find>number</find>
+      <find>sch</find>
+      <find>longissu</find>
+      <find>op</find>
+      <find>num</find>
+      <find>print</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -112,12 +134,13 @@
         <option value="$PROJECT_DIR$/funding_analysis/edbuild_district_data.py" />
         <option value="$PROJECT_DIR$/funding_analysis/relevant_data_f33.py" />
         <option value="$PROJECT_DIR$/funding_analysis/print_all_f33_data.py" />
-        <option value="$PROJECT_DIR$/funding_analysis/revenue_adjustments.py" />
-        <option value="$PROJECT_DIR$/funding_analysis/edbuild_data/edbuild_district_data.py" />
         <option value="$PROJECT_DIR$/funding_analysis/f33_data/selecting_f33_data.py" />
         <option value="$PROJECT_DIR$/funding_analysis/examples/find_description.py" />
         <option value="$PROJECT_DIR$/funding_analysis/examples/selecting_f33_data.py" />
         <option value="$PROJECT_DIR$/funding_analysis/f33_data/relevant_data_f33.py" />
+        <option value="$PROJECT_DIR$/funding_analysis/cleaning2.py" />
+        <option value="$PROJECT_DIR$/funding_analysis/edbuild_data/edbuild_district_data.py" />
+        <option value="$PROJECT_DIR$/funding_analysis/revenue_adjustments.py" />
       </list>
     </option>
   </component>
@@ -144,12 +167,23 @@
               <item name="funding-analysis" type="462c0819:PsiDirectoryNode" />
               <item name="funding_analysis" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="funding-analysis" type="b2602c69:ProjectViewProjectNode" />
+              <item name="funding-analysis" type="462c0819:PsiDirectoryNode" />
+              <item name="funding_analysis" type="462c0819:PsiDirectoryNode" />
+              <item name="edbuild_data" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="funding-analysis" type="b2602c69:ProjectViewProjectNode" />
               <item name="funding-analysis" type="462c0819:PsiDirectoryNode" />
               <item name="funding_analysis" type="462c0819:PsiDirectoryNode" />
               <item name="f33_data" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="funding-analysis" type="b2602c69:ProjectViewProjectNode" />
+              <item name="funding-analysis" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -163,6 +197,10 @@
     <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
   </component>
   <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Users\KORYANN\Documents\Repos\funding-analysis\resources" />
+      <recent name="C:\Users\KORYANN\Documents\Repos\funding-analysis\resources\raw_data" />
+    </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="C:\Users\KORYANN\Documents\Repos\funding-analysis\resources\raw_f33_data" />
       <recent name="C:\Users\KORYANN\Documents\Repos\funding-analysis\funding_analysis\examples" />
@@ -170,10 +208,6 @@
       <recent name="C:\Users\KORYANN\Documents\Repos\funding-analysis\funding_analysis\f33_data" />
       <recent name="C:\Users\KORYANN\Documents\Repos\funding-analysis" />
     </key>
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="C:\Users\KORYANN\Documents\Repos\funding-analysis\resources" />
-      <recent name="C:\Users\KORYANN\Documents\Repos\funding-analysis\resources\raw_data" />
-    </key>
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -188,7 +222,7 @@
     </option>
   </component>
   <component name="RunManager" selected="Python.revenue_adjustments">
-    <configuration name="edbuild_district_data" type="PythonConfigurationType" factoryName="Python" temporary="true">
+    <configuration name="cleaning2" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="funding-analysis" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -196,11 +230,11 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/funding_analysis/edbuild_data" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/funding_analysis" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/funding_analysis/edbuild_data/edbuild_district_data.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/funding_analysis/cleaning2.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -297,9 +331,9 @@
       <list>
         <item itemvalue="Python.revenue_adjustments" />
         <item itemvalue="Python.print_all_f33_data (1)" />
+        <item itemvalue="Python.cleaning2" />
         <item itemvalue="Python.selecting_f33_data" />
         <item itemvalue="Python.find_description" />
-        <item itemvalue="Python.edbuild_district_data" />
       </list>
     </recent_temporary>
   </component>
@@ -334,7 +368,7 @@
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32956153" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.38330975" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.37057993" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39886847" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -370,16 +404,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/funding_analysis/cleaning2.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="323">
-          <caret line="23" column="39" selection-start-line="23" selection-start-column="39" selection-end-line="23" selection-end-column="39" />
-          <folding>
-            <element signature="e#0#18#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/funding_analysis/examples/find_description.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="340">
@@ -387,16 +411,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/funding_analysis/edbuild_data/edbuild_district_data.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="8" column="18" selection-start-line="8" selection-start-column="18" selection-end-line="8" selection-end-column="18" />
-          <folding>
-            <element signature="e#96#110#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/funding_analysis/examples/loading_data.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="765">
@@ -414,12 +428,12 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/funding_analysis/f33_data/relevant_data_f33.py">
+    <entry file="file://$PROJECT_DIR$/funding_analysis/cleaning2.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="204">
-          <caret line="27" column="60" lean-forward="true" selection-start-line="27" selection-start-column="60" selection-end-line="27" selection-end-column="60" />
+          <caret line="12" selection-start-line="12" selection-end-line="12" />
           <folding>
-            <element signature="e#84#98#0" expanded="true" />
+            <element signature="e#0#18#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -427,14 +441,37 @@
     <entry file="file://$PROJECT_DIR$/funding_analysis/f33_data/print_all_f33_data.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="204">
-          <caret line="13" column="35" lean-forward="true" selection-start-line="13" selection-start-column="35" selection-end-line="13" selection-end-column="35" />
+          <caret line="13" column="52" selection-start-line="13" selection-start-column="52" selection-end-line="13" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/funding_analysis/edbuild_data/edbuild_district_data.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="204">
+          <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
+          <folding>
+            <element signature="e#96#110#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/funding_analysis/f33_data/relevant_data_f33.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="187">
+          <caret line="74" column="11" lean-forward="true" selection-start-line="74" selection-start-column="11" selection-end-line="74" selection-end-column="11" />
+          <folding>
+            <element signature="e#84#98#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/funding_analysis/revenue_adjustments.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="694">
-          <caret line="94" lean-forward="true" selection-start-line="94" selection-end-line="94" />
+        <state relative-caret-position="-297">
+          <caret line="79" column="76" lean-forward="true" selection-start-line="79" selection-start-column="76" selection-end-line="79" selection-end-column="76" />
+          <folding>
+            <element signature="e#118#186#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/funding_analysis/edbuild_data/__pycache__/edbuild_district_data.cpython-37.pyc b/funding_analysis/edbuild_data/__pycache__/edbuild_district_data.cpython-37.pyc
index b96602aabe6d0c3ab0a12f8aac1e2fb8626d2a12..e955f69ef2abac51a55b9340221d1119ac8740d0 100644
GIT binary patch
delta 469
zcmXv}Jxc>Y5Z&23FP95<ml)$05=}tiG>D>&D2U&MVv|AzMb6|3V`Ac5B1YE6(n{Dr
z5DR~RTwx(t3l`R<6dOyyLa=f7&|PMj**Ejv+mE5|jJ0T*1`)@3dfpvP+*uFmtS;Im
z5q?f21}$<!E}&^JQUV5jBu`XQr$+{k0Fk!{d9od5hw?Y|r*G3y+8vEr%|na{hPJ-$
zHCGU;$lp7rtxzqZQwj!Hz|&f8UKLX^LeU9P)JY43C_T$ESSEY@7Yb8aRJ<sRv_yRa
zj51}8oLF0g(V(DB!GelWDHdIJ>+UML6%Ui5$8M1v70nPkb@9+WD0_Z8?t5jgQ1^=a
zg=)D`IrcHdC+#GEjMynh%=)2CO{WIcX(v6;@*yn~{6wxGIv{B!H@}X)!c0&yRzR1%
zqu?;VkIlhG@D;m+p7j49c1e_mCjNA8%>?WO_vQ{{Mg-Uf!vU1Se_pXyE{6=#*f13N
emW`VH4fgXFyC*g%OSyq#{L>y+EIrP%@wH!Ci(^Fq

delta 331
zcmeyN_)>w-iI<m)0SNY5pNd(|zmab@izE|}>kP!jAc-1=EQT6JNrqqsO~%PAtiRbc
z8H>1q;*%xVOgKO)8Q7{6Cl_!iPOfF+1Z%~ree+Q^V@3&xR!ycNUZB2PoMnkcnTbg`
zsl}6RIOMsNfnvoF6F28^tYzet04ZWEEhtDWx}`gL4U_KVV6Ih++MEAzxiWG{10^+?
zi<BmN^Vl%jZSLS{Vw8~riWPw*ZgF_0R=O4y<rhKiDiWTo$fv^Sz1fW~l2H+4(=A3W
zpik66rm%pWQzQz~4K@O#Sa|Yfej&!N$<O$U*hD}wVw2+p#JOcaOpvZ3&B+Y{ddwUg
K9FsQ+xB~!n#X?H}

diff --git a/funding_analysis/edbuild_data/edbuild_district_data.py b/funding_analysis/edbuild_data/edbuild_district_data.py
index 667fa73..ccc4d60 100644
--- a/funding_analysis/edbuild_data/edbuild_district_data.py
+++ b/funding_analysis/edbuild_data/edbuild_district_data.py
@@ -30,7 +30,13 @@ def select_column(self, variable):
         :param variable: The variable / column title for which all available data is being selected
         :return: All data for this variable / column item in a series
         """
-        return self.district_data_df[variable]
+        # Ensure the variable is upper case
+        variable = variable.upper()
+
+        try:
+            return self.district_data_df[variable]
+        except KeyError:
+            return None
 
     def select_columns(self, variables):
         """
@@ -38,7 +44,15 @@ def select_columns(self, variables):
         :param variables: A list of variables / column titles for which all available data is being selected
         :return: All data for these variables / column titles in a pandas dataframe
         """
-        return self.district_data_df[variables]
+        selected_columns = pandas.DataFrame()
+
+        for variable in variables:
+            # Ensure the variable is upper case
+            variable = variable.upper()
+
+            selected_columns[variable] = self.select_column(variable)
+
+        return selected_columns
 
     def __abbreviate_column_titles(self):
         """
diff --git a/funding_analysis/revenue_adjustments.py b/funding_analysis/revenue_adjustments.py
index bb82aa0..ab044c8 100644
--- a/funding_analysis/revenue_adjustments.py
+++ b/funding_analysis/revenue_adjustments.py
@@ -3,16 +3,39 @@
 from funding_analysis.edbuild_data.edbuild_district_data import EdbuildDistrictData
 import pathlib
 import pandas
+import re
 
 # Load the relevant data
 relevant_data = RelevantData()
 
-# Load the district data
-district_data = EdbuildDistrictData()
-
 # Get just the state revenue
 adjusted_revenues = relevant_data.select_columns(['Idcensus', 'STATE', 'TSTREV', 'TLOCREV', 'TFEDREV', 'SCHLEV',
-                                                  'ENROLL'])
+                                                  'ENROLL', 'NCESID'])
+
+# Put the NCESID in front and sort by it
+cols = list(adjusted_revenues.columns)
+cols.insert(0, cols.pop(cols.index('NCESID')))
+adjusted_revenues = adjusted_revenues.loc[:, cols]
+adjusted_revenues.sort_values(['NCESID'])
+
+# Load all of the Common Core Data
+outputfilepath = pathlib.Path(__file__).parents[1] / 'resources' / 'outdatademo.xls'
+
+# Read file and sort by NCESID
+demographic_df = pandas.read_excel(outputfilepath)
+demographic_df.sort_values('NCESID')
+
+# Add all non-duplicate columns from the demographic table to the cost adjusted revenues table
+for col in demographic_df.columns:
+    if col not in adjusted_revenues:
+        adjusted_revenues[col] = demographic_df[col]
+
+# Print the unchanged table
+print(adjusted_revenues)
+
+
+# ~~~ DONE LOADING ALL NECESSARY DATA. READY TO BEGIN ADJUSTMENTS ~~~ #
+
 
 # Remove the capital outlay
 capital_outlay_series = relevant_data.select_column('C11')
@@ -72,23 +95,24 @@
 states = [str(num) for num in range(52)]
 adjusted_revenues = adjusted_revenues.loc[adjusted_revenues['STATE'].isin(states)]
 
-# Calculate Per-pupil state and local revenues
-adjusted_revenues['PPSTATE'] = adjusted_revenues['TSTREV'] / adjusted_revenues['ENROLL']
-adjusted_revenues['PPLOCAL'] = adjusted_revenues['TLOCREV'] / adjusted_revenues['ENROLL']
-print(adjusted_revenues)
+# School districts that intersect with Native American Reservations because federal dollars are a much larger
+# proportion of revenue for Bureau of Indian Affairs (BIA) schools and the federal dollars are not always intended
+# to supplement funds from BIA. TODO
+our_ncesids = adjusted_revenues['NCESID'].tolist()
 
 
-# Load all of the Common Core Data
-outputfilepath = pathlib.Path(__file__).parents[1] / 'resources' / 'outdatademo.xls'
-
-# Reads file
-demographic_df = pandas.read_excel(outputfilepath)
+# Load the district data
+district_data = EdbuildDistrictData()
+edbuild_ncesids = district_data.select_column('ncesid').tolist()
+print(edbuild_ncesids)
 
-# Add all columns from the demographic table to the cost adjusted revenues table
-for col in demographic_df.columns:
-    adjusted_revenues[col] = demographic_df[col]
+# Check if the NCESID is in the edbuild data. Remove it if it isn't. (Our data has an extra leading zero)
+to_remove = [ncesid for ncesid in our_ncesids if int(ncesid[1:]) not in edbuild_ncesids]
+print(str(to_remove) + '\n' + str(len(our_ncesids)) + '\t' + str(len(edbuild_ncesids)) + '\t' + str(len(to_remove)) +
+      '\n')
+adjusted_revenues = adjusted_revenues.loc[~adjusted_revenues['NCESID'].isin(to_remove)]
 
-# Print names of columns in table
-for col in adjusted_revenues.columns:
-    print(col)
-print()
+# Calculate Per-pupil state and local revenues
+adjusted_revenues['PPSTATE'] = adjusted_revenues['TSTREV'] / adjusted_revenues['ENROLL']
+adjusted_revenues['PPLOCAL'] = adjusted_revenues['TLOCREV'] / adjusted_revenues['ENROLL']
+print(adjusted_revenues)