Imreg refactor

CONTRIBUTORS.txt

@@ -1,8 +1,8 @@
 - Nathan Faggian
-  BDFL: Project coordination, methods development.
+  Australian Bureau of Meteorology
 
 - Stefan Van Der Walt
-  Project coordination, methods development.
+  UC Berkley
 
 - Riaan Van Den Dool
-  Feature detection methods.
+

LICENSE.txt

@@ -1,4 +1,8 @@
-Copyright 2011, Nathan Faggian (nathan.faggian@gmail.com)
+Copyright 2011, 
+Nathan Faggian, Australian Bureau of Meteorology. (nfaggian@bom.gov.au)
+Stefan Van Der Walt.
+Riaan Van Den Dool. (riaanvddool@gmail.com)
+
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

README.rst

@@ -3,14 +3,14 @@
 About
 =====
 
-python-register is a python module for image registration built ontop of scipy and numpy.
+*imreg*, short for image registration, is a python package for image registration built ontop of scipy and numpy.
 
 It is currently maintained by Nathan Faggian, Riaan Van Den Dool and Stefan Van Der Walt.
 
 Important links
 ===============
 
-- Official source code: https://github.com/nfaggian/python-register
+- Forked from : https://github.com/nfaggian/python-register
 
 Dependencies
 ============
@@ -20,7 +20,6 @@ setuptools, NumPy >= 1.5, SciPy >= 0.9 and a working C++ compiler.
 
 To run the tests you will also need py.test >= 2.0.
 
-
 Install
 =======
 
@@ -38,7 +37,7 @@ To install for all users on Unix/Linux::
 Development
 ===========
 
-Basic rules for commits to the python-register repository:
+Basic rules for commits to the imreg repository:
 
  + master is our stable "release" branch.
 
@@ -51,7 +50,7 @@ GIT
 
 You can check the latest sources with the command::
 
-    git clone git://github.com/nfaggian/python-regsiter.git
+    git clone git://github.com/pyimreg/imreg.git
 
 Contributors
 ~~~~~~~~~~~~~

documentation/conf.py

@@ -40,8 +40,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'python-register'
-copyright = u'2011, Nathan Faggian, Stefan Van Der Walt, Riaan Van Den Dool'
+project = u'imreg'
+copyright = u'2012, Nathan Faggian, Stefan Van Der Walt, Riaan Van Den Dool'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -164,7 +164,7 @@
 #html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'python-registerdoc'
+htmlhelp_basename = 'imregdoc'
 
 
 # -- Options for LaTeX output --------------------------------------------------
@@ -178,7 +178,7 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'python-register.tex', u'python-register Documentation',
+  ('index', 'imreg.tex', u'imreg Documentation',
    u'Nathan Faggian, Stefan Van Der Walt, Riaan Van Den Dool', 'manual'),
 ]
 
@@ -211,6 +211,6 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'python-register', u'python-register Documentation',
+    ('index', 'imreg', u'python-register Documentation',
      [u'Nathan Faggian, Stefan Van Der Walt, Riaan Van Den Dool'], 1)
 ]

documentation/deformation_models.rst

@@ -2,5 +2,5 @@
 Deformation models
 =============================
 
-.. automodule:: register
+.. automodule:: register.models.model
     :members:

examples/README.rst

@@ -3,7 +3,7 @@
 About
 ========
 
-Demonstrates uses of the sci-kit:
+Demonstrates uses of the package:
 
   Examples of 2D linear and nonlinear image registration.
 

examples/haar_features.py

@@ -6,7 +6,7 @@
 import scipy.ndimage as nd
 from matplotlib.pyplot import imread, plot, imshow, show
 
-from register.features.detector import detect, HaarDetector
+from imreg.features.detector import detect, HaarDetector
 
 # Load the image.
 image = imread('data/cameraman.png')

examples/linreg.py

@@ -7,12 +7,12 @@
 import scipy.ndimage as nd
 import scipy.misc as misc
 
-from register.models import model
-from register.metrics import metric
-from register.samplers import sampler
-from register import register
+from imreg.models import model
+from imreg.metrics import metric
+from imreg.samplers import sampler
+from imreg import register
 
-from register.visualize import plot
+from imreg.visualize import plot
 
 # Form some test data (lena, lena rotated 20 degrees)
 image = misc.lena()

examples/linreg_pyramid.py

@@ -6,13 +6,13 @@
 import scipy.ndimage as nd
 import scipy.misc as misc
 
-from register.models import model
-from register.metrics import metric
-from register.samplers import sampler
+from imreg.models import model
+from imreg.metrics import metric
+from imreg.samplers import sampler
 
-from register.visualize import plot
+from imreg.visualize import plot
 
-from register import register
+from imreg import register
 
 # Form some test data (lena, lena rotated 20 degrees)
 image = register.RegisterData(misc.lena())

examples/nonlinreg.py

@@ -7,12 +7,12 @@
 import scipy.ndimage as nd
 import scipy.misc as misc
 
-from register.models import model
-from register.metrics import metric
-from register.samplers import sampler
+from imreg.models import model
+from imreg.metrics import metric
+from imreg.samplers import sampler
 
-from register.visualize import plot
-from register import register
+from imreg.visualize import plot
+from imreg import register
 
 def warp(image):
     """

examples/nonlinreg_image.py

@@ -11,12 +11,12 @@
 
 from matplotlib.pyplot import imread
 
-from register.models import model
-from register.metrics import metric
-from register.samplers import sampler
+from imreg.models import model
+from imreg.metrics import metric
+from imreg.samplers import sampler
 
-from register.visualize import plot
-from register import register
+from imreg.visualize import plot
+from imreg import register
 
 # Form some test data (lena, lena rotated 20 degrees)
 image = imread('data/frown.png')[:, :, 0]

examples/nonlinreg_image_features.py

@@ -13,11 +13,11 @@
 
 import matplotlib.pyplot as plt
 
-from register.models import model
-from register.samplers import sampler
-from register.visualize import plot
+from imreg.models import model
+from imreg.samplers import sampler
+from imreg.visualize import plot
 
-from register import register
+from imreg import register
 
 # Load the image and feature data. 
 image = register.RegisterData(

examples/nonlinreg_pyramid.py

@@ -7,11 +7,11 @@
 import scipy.ndimage as nd
 import scipy.misc as misc
 
-from register.models import model
-from register.metrics import metric
-from register.samplers import sampler
-from register.visualize import plot
-from register import register
+from imreg.models import model
+from imreg.metrics import metric
+from imreg.samplers import sampler
+from imreg.visualize import plot
+from imreg import register
 
 def warp(image):
     """

examples/projective.py

@@ -7,12 +7,12 @@
 import scipy.ndimage as nd
 import scipy.misc as misc
 
-from register.models import model
-from register.metrics import metric
-from register.samplers import sampler
+from imreg.models import model
+from imreg.metrics import metric
+from imreg.samplers import sampler
 
-from register.visualize import plot
-from register import register
+from imreg.visualize import plot
+from imreg import register
 
 def warp(image):
     """