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

Added CW-SSIM for computing SSIM in complex wavelet domain #12

Merged
merged 1 commit into from
Jun 20, 2015

Conversation

chaosmail
Copy link

Hi guys,

thanks for your nice library! I added SSIM computation in complex wavelet domain (IMAGE SIMILARITY IN COMPLEX WAVELET DOMAIN from Zhou Wang and Eero P. Simoncelli), which is invariant to translation and rotation. I added an IPhython notebook with the examples and benchmarks.

Best,
Christoph

@jterrace
Copy link
Owner

Could you fix the pylint errors? See the README for how to run it.

@@ -0,0 +1,3 @@
*.pyc
Copy link
Owner

Choose a reason for hiding this comment

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

These should be in your global .gitignore, rather than the project one.
See: https://help.github.com/articles/ignoring-files/#create-a-global-gitignore

Copy link
Author

Choose a reason for hiding this comment

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

alright, I removed the .gitignore again

@jterrace
Copy link
Owner

Could you also add a command-line flag to use this new algorithm and add a test that uses it in .travis.yml?

@chaosmail
Copy link
Author

Alright, I tried to address all your remarks in the last commit.

@chaosmail
Copy link
Author

hmm what's going on in the Travis build, there are strange errors. I also added Python 3.4 to the .travis.yml because I am using it on my machine and it works nice; however, there is also some issue in Travis.

@chaosmail
Copy link
Author

Alright, I could resolve all the errors; I rebased the PR to a nice commit. Btw. I added conda to Travis, to speed up the tests; also I removed python 3.2 (it should not be used) and added python 3.3 and 3.4 to Travis. I added tests, some description in the README, some command line arguments and the Reference to the paper. Let me know if you need further adjustments ;)

@chaosmail
Copy link
Author

I almost forgot; there is also the IPython file in the root folder (comparing the 2 methods) and the PDF paper in the readings folder. Hope that's ok - if not then I will remove them.
Best,
Christoph

@jterrace
Copy link
Owner

Yeah, 3.2 was broken at head too. You actually managed to fix the errors? Sweet!


before_install:
- sudo apt-get install -qq python-numpy python-scipy python3-numpy python3-scipy
- wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
Copy link
Owner

Choose a reason for hiding this comment

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

can you change this to https?

@jterrace
Copy link
Owner

Just two minor comments and it's ready to merge. Thanks for the contribution!

Added comments and fixed docstrings.
Added py3.3 and py3.4 to travis. Removed py3.2.
Added cw, width and height arguments. Added tests.
Added reference in README.
Fixed .travis.yml and added conda.

Cleaned .travis.yml
@chaosmail
Copy link
Author

alright, here we go.

jterrace added a commit that referenced this pull request Jun 20, 2015
Added CW-SSIM for computing SSIM in complex wavelet domain
@jterrace jterrace merged commit ec9488a into jterrace:master Jun 20, 2015
@jterrace
Copy link
Owner

Nice contribution. Thank you!

@jterrace
Copy link
Owner

Once thing I forgot - will you send me a followup CL to add yourself to the AUTHORS file?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants