cdleong commited on
Commit
a7334d4
·
verified ·
1 Parent(s): 66eb77a

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +26 -1
app.py CHANGED
@@ -130,12 +130,24 @@ def get_normal_and_bible(
130
  if forbidden_names is None:
131
  forbidden_names = set()
132
 
 
 
 
 
133
  filtered_ssa = ssa_names_aggregated_df.copy()
 
 
 
 
 
 
134
  filtered_ssa = filtered_ssa[
135
  filtered_ssa[ssa_names_col].str.len().between(min_length_ssa, max_length_ssa)
136
  ]
137
  if sex:
138
  filtered_ssa = filtered_ssa[filtered_ssa["sex"] == sex]
 
 
139
  if debug:
140
  print(f"SSA names after length/sex filter: {len(filtered_ssa)}")
141
 
@@ -150,15 +162,28 @@ def get_normal_and_bible(
150
 
151
  ssa_name = filtered_ssa.sample(1)[ssa_names_col].values[0]
152
 
 
 
 
 
 
 
 
153
  filtered_bible = bible_names_df.copy()
 
 
154
  filtered_bible = filtered_bible[
155
  filtered_bible[bible_names_col].str.len().between(min_length_bible, max_length_bible)
156
  ]
 
 
157
  if sex:
158
  filtered_bible = filtered_bible[filtered_bible["sex"] == sex]
 
 
159
  filtered_bible = filtered_bible[~filtered_bible[bible_names_col].isin(forbidden_names)]
160
  if debug:
161
- print(f"Bible names after filtering: {len(filtered_bible)}")
162
 
163
  if len(filtered_bible) == 0 or len(filtered_ssa) == 0:
164
  raise ValueError("No valid names found after filtering.")
 
130
  if forbidden_names is None:
131
  forbidden_names = set()
132
 
133
+ if debug:
134
+ print(f"There are {len(ssa_names_aggregated_df)} SSA names at the beginning")
135
+
136
+
137
  filtered_ssa = ssa_names_aggregated_df.copy()
138
+
139
+ filtered_ssa = filtered_ssa[~filtered_ssa[ssa_names_col].isin(forbidden_names)]
140
+
141
+ if debug:
142
+ print(f"SSA names after FORBIDDEN NAMES filter: {len(filtered_ssa)}")
143
+
144
  filtered_ssa = filtered_ssa[
145
  filtered_ssa[ssa_names_col].str.len().between(min_length_ssa, max_length_ssa)
146
  ]
147
  if sex:
148
  filtered_ssa = filtered_ssa[filtered_ssa["sex"] == sex]
149
+
150
+
151
  if debug:
152
  print(f"SSA names after length/sex filter: {len(filtered_ssa)}")
153
 
 
162
 
163
  ssa_name = filtered_ssa.sample(1)[ssa_names_col].values[0]
164
 
165
+
166
+
167
+
168
+
169
+ # ------------
170
+ # Bible names
171
+
172
  filtered_bible = bible_names_df.copy()
173
+ if debug:
174
+ print(f"Bible names before filtering: {len(filtered_bible)}")
175
  filtered_bible = filtered_bible[
176
  filtered_bible[bible_names_col].str.len().between(min_length_bible, max_length_bible)
177
  ]
178
+ if debug:
179
+ print(f"Bible names after lengthfiltering: {len(filtered_bible)}")
180
  if sex:
181
  filtered_bible = filtered_bible[filtered_bible["sex"] == sex]
182
+ if debug:
183
+ print(f"Bible names after sex filtering: {len(filtered_bible)}")
184
  filtered_bible = filtered_bible[~filtered_bible[bible_names_col].isin(forbidden_names)]
185
  if debug:
186
+ print(f"Bible names after FORBIDDEN NAMES filtering: {len(filtered_bible)}")
187
 
188
  if len(filtered_bible) == 0 or len(filtered_ssa) == 0:
189
  raise ValueError("No valid names found after filtering.")