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.

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

Issue22 : restructured the image-processing module. #30

Closed
wants to merge 18 commits into from

Conversation

Shankhanil
Copy link
Collaborator

No description provided.

@Shankhanil Shankhanil marked this pull request as ready for review March 24, 2021 14:56
@Ask149 Ask149 added gssoc21 GirlScript Summer of Code'21 Level2 Hard Level Difficulty labels Mar 26, 2021
Sibasish-Padhy and others added 13 commits April 2, 2021 01:34
here  I have documented the methods in image_visualize.py  asper what I could understand. Please go through it .I tried to create a function for implementing all these methods but I don't know which dataset to implement it on. A little more clarification from your end will be appreciated. Thank you
have updated the changes by running on local machine.please have a look also trying to change the .rst file you  suggested me for
* Added the standardisation function

* Added Mean Normalization & changed name of the function standardize to z_score_normalization

* Added the standardisation function

* Added Mean Normalization & changed name of the function standardize to z_score_normalization

Co-authored-by: ask149 <[email protected]>
@Ask149
Copy link
Contributor

Ask149 commented Apr 1, 2021

Hi @Shankhanil, Could you please resolve the conflicting files by rebasing your branch with the upstream master?

@harshasridhar Can you please review the Pull request changes?

@harshasridhar
Copy link
Collaborator

@Shankhanil we can review it either tomorrow or day after tomorrow,let me know when you've fixed the merge conflicts

Copy link
Contributor

@Ask149 Ask149 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a few comments, make sure you remove the csv_preprocess and image_visualize files from the PR.

@@ -72,8 +72,13 @@ def fill_numerical_na(self, ret = False):
self.df[col] = y
except Exception as e:
pass
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please fix this?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The conflict seems not resolved yet

@@ -84,6 +89,25 @@ def normalize_numerical(self):
for col in self.numerical_column_list:
if col != self.target_column:
self.df[col]=(self.df[col]-self.df[col].min())/(self.df[col].max()-self.df[col].min())
def standardize(self):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this file from the PR to avoid any conflicts.

def __init__(self, data, labels, boxes=None):
"""Constructor for Image Data Visualization.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this file as well from the PR, to avoid conflicts. Can you please confirm if you have successfully rebased and taken the latest pull?

Copy link
Collaborator Author

@Shankhanil Shankhanil Apr 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had taken the latest pull, but maybe I had made some minor changes while testing the code, which might've caused the conflicts. Resolving them nw.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please guide me on how to remove this file from PR

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try using following commands
git checkout HEAD^ -- /path/to/file
git commit -m 'Message'
git push

Copy link
Collaborator Author

@Shankhanil Shankhanil Apr 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried this, it's showing the message
nothing to commit, working tree clean

Am i missing smth?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let us move the conversation to slack

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Slack channel pls?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Ask149 Ask149 linked an issue Apr 4, 2021 that may be closed by this pull request
@Shankhanil
Copy link
Collaborator Author

Will update them ASAP.

@Ask149
Copy link
Contributor

Ask149 commented Apr 5, 2021

Let is know once you are done resolving the conflict and updating the changes.

@Shankhanil
Copy link
Collaborator Author

Please review the PR

Copy link
Contributor

@Ask149 Ask149 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created a duplicate PR, declining this one.

@Ask149 Ask149 closed this Apr 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
gssoc21 GirlScript Summer of Code'21 Level2 Hard Level Difficulty
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Restructure the image preprocessing module to provide submodules
5 participants