solves #issue82 by fixing the comparison between a Series and a list

navigating-stories · Aug 14, 2024 · dee9988 · dee9988
1 parent b207f20
commit dee9988
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/orangecontrib/storynavigation/modules/actionanalysis.py b/orangecontrib/storynavigation/modules/actionanalysis.py
@@ -222,7 +222,8 @@ def __filter_custom_word_matches(self, story_elements_df, selected_stories, cust
             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'] 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
@@ -47,7 +47,9 @@ def __filter_custom_word_matches(self, story_elements_df, selected_stories, cust
             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'] 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):