Merge pull request #83 from navigating-stories/issue82

solves #issue82 by fixing the comparison between a Series and a list
navigating-stories · Sep 3, 2024 · 0b05b9c · 0b05b9c
2 parents b207f20 + 61d5458
commit 0b05b9c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/orangecontrib/storynavigation/modules/actionanalysis.py b/orangecontrib/storynavigation/modules/actionanalysis.py
@@ -221,8 +221,8 @@ def __filter_custom_word_matches(self, story_elements_df, selected_stories, cust
             current_frame['classification'] = c_col
             current_frame.rename(columns={cust_tag_col: 'category'}, inplace=True)
             combined_df = pd.concat([combined_df, current_frame], axis=0)
-
-        combined_df = combined_df[combined_df['category'] not in ['?', 'nan']]
+        
+        combined_df = combined_df[~combined_df['category'].isin(['?', 'nan'])]
         return combined_df.reset_index(drop=True)
 
     def calculate_customfreq_table(self, df, selected_stories=None):

diff --git a/orangecontrib/storynavigation/modules/actoranalysis.py b/orangecontrib/storynavigation/modules/actoranalysis.py
@@ -46,8 +46,9 @@ def __filter_custom_word_matches(self, story_elements_df, selected_stories, cust
             current_frame['classification'] = c_col
             current_frame.rename(columns={cust_tag_col: 'category'}, inplace=True)
             combined_df = pd.concat([combined_df, current_frame], axis=0)
-
-        combined_df = combined_df[combined_df['category'] not in ['?', 'nan']]
+
+        combined_df = combined_df[~combined_df['category'].isin(['?', 'nan'])]
+
         return combined_df.reset_index(drop=True)
 
     def __filter_rows(self, story_elements_df, pos_tags):