Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Sep 3, 2024
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dee9988
solves #issue82 by fixing the comparison between a Series and a list
ThijsVroegh Aug 14, 2024
61d5458
Remove old commented-out lines of code
ThijsVroegh Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion orangecontrib/storynavigation/modules/actionanalysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
4 changes: 3 additions & 1 deletion orangecontrib/storynavigation/modules/actoranalysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
Loading