cleanup

Author: Eric Tsai

src/election_anomaly/__init__.py

@@ -267,55 +267,6 @@ def load_results(self) -> dict:
 		return err
 
 
-# class Analyzer():
-# 	def __new__(self):
-# 		""" Checks if parameter file exists and is correct. If not, does
-# 		not create DataLoader object. """
-# 		try:
-# 			d, parameter_err = ui.get_runtime_parameters(analyze_pars, param_file='multi.par')
-# 		except FileNotFoundError as e:
-# 			print("Parameter file not found. Ensure that it is located" \
-# 				" in the current directory. Analyzer object not created.")
-# 			return None
-
-# 		if parameter_err:
-# 			print("Parameter file missing requirements.")
-# 			print(parameter_err)
-# 			print("Analyzer object not created.")
-# 			return None
-
-# 		return super().__new__(self)
-
-# 	def __init__(self):
-# 		self.d, self.parameter_err = ui.get_runtime_parameters(analyze_pars,param_file='multi.par')
-
-# 		eng = dbr.sql_alchemy_connect(paramfile=self.d['db_paramfile'],
-# 			db_name=self.d['db_name'])
-# 		Session = sessionmaker(bind=eng)
-# 		self.session = Session()
-
-# 	def display_options(self, input):
-# 		results = dbr.get_input_options(self.session, input)
-# 		if results:
-# 			return results
-# 		return None
-
-	# def top_counts_by_vote_type(self, election, rollup_unit, sub_unit):
-	# 	d, error = ui.get_runtime_parameters(['rollup_directory'], param_file='multi.par')
-	# 	if error:
-	# 		err_str = f'Parameter file missing requirements.\n{error}\nNo results exported'
-	# 		print(err_str)
-	# 	else:
-	# 		connection = self.session.bind.raw_connection()
-	# 		cursor = connection.cursor()
-	# 		rollup_unit_id = dbr.name_to_id(self.session, 'ReportingUnit', rollup_unit)
-	# 		sub_unit_id = dbr.name_to_id(self.session, 'ReportingUnitType', sub_unit)
-	# 		election_id = dbr.name_to_id(self.session, 'Election', election)
-	# 		err_str = avp.create_rollup(cursor, d['rollup_directory'], rollup_unit_id,
-	# 			sub_unit_id, election_id)
-	# 		connection.close()
-	# 	return err_str
-
 class JurisdictionPrepper():
 	def __new__(cls):
 		""" Checks if parameter file exists and is correct. If not, does
@@ -719,22 +670,6 @@ def display_options(self, input, verbose=False, filters=None):
         return None
 
 
-    # def top_counts_by_vote_type(self, rollup_unit, sub_unit):
-    #     d, error = ui.get_runtime_parameters(['rollup_directory'])
-    #     if error:
-    #         print("Parameter file missing requirements.")
-    #         print(error)
-    #         print("Data not created.")
-    #         return
-    #     else:
-    #         rollup_unit_id = dbr.name_to_id(self.session, 'ReportingUnit', rollup_unit)
-    #         sub_unit_id = dbr.name_to_id(self.session, 'ReportingUnitType', sub_unit)
-    #         results_info = dbr.get_datafile_info(self.session, self.d['results_file_short'])
-    #         rollup = a.create_rollup(self.session, d['rollup_directory'], top_ru_id=rollup_unit_id,
-    #             sub_rutype_id=sub_unit_id, sub_rutype_othertext='', datafile_id_list=results_info[0], 
-    #             election_id=results_info[1])
-    #         return
-
     def top_counts_by_vote_type(self, election, rollup_unit, sub_unit):
         d, error = ui.get_runtime_parameters(['rollup_directory'], param_file='multi.par')
         if error:

src/election_anomaly/db_routines/__init__.py

@@ -880,8 +880,6 @@ def get_filtered_input_options(session, input_str, filters):
             ['CountItemType_Id'].unique()
         count_types_df = pd.read_sql_table('CountItemType', session.bind, index_col='Id')
         count_types = list(count_types_df[count_types_df.index.isin(count_type_ids)]['Txt'].unique())
-            #.merge(vote_count_df, how='inner', left_index=True, right_on='CountItemType_Id') \
-            #['Txt'].unique())
         count_types.sort()
         data = {
             'parent': [filters[0] for count_type in count_types] + [filters[0] for count_type in count_types],
@@ -915,13 +913,7 @@ def get_filtered_input_options(session, input_str, filters):
 			right_on='Candidate_Id')
         candidates_df = candidates_df.merge(candidate_names_df, how='inner', left_on='name',
 			right_on='BallotName')
-        #candidate_contest_df.columns = ['parent', 'name', 'type']
-        # contest_df = contest_df.merge(candidate_contest_df, how='inner', left_on='name', 
-        #     right_on='Name')[contest_df.columns]
-        contests = get_input_options(session, 'candidate_contest', True)  
-        contests_df = pd.DataFrame(contests)
-        contests_df.columns = contests.keys()
-        df = contests_df.merge(candidates_df, how='inner', left_on='name', right_on='parent',
+        df = contest_df.merge(candidates_df, how='inner', left_on='name', right_on='parent',
             suffixes=['_x', None])[candidates_df.columns]
     else:
         candidates = get_input_options(session, input_str, True)