Commit Graph

5928 Commits

Author SHA1 Message Date
Stefan van der Walt 2eae93124a Merge pull request #440 from ahojnnes/fitting
ENH: Line, Circle, Ellipse total least squares fitting and RANSAC algorithm.
2013-05-07 04:34:54 -07:00
Johannes Schönberger 219d621725 Set random seed to avoid random test failures 2013-05-06 18:34:34 +02:00
Johannes Schönberger 13bfd603f3 Add simple RANSAC example script 2013-05-06 18:25:15 +02:00
Johannes Schönberger 54e3757cb0 Wrap lines 2013-05-06 18:08:46 +02:00
Johannes Schönberger 01124f5bcc Use boolean mask for inlier return value of RANSAC 2013-05-06 18:08:21 +02:00
Tony S Yu 4d7905951b Merge pull request #536 from ahojnnes/edge-weights
Some tweaks for edges.py
2013-05-06 08:17:00 -07:00
Johannes Schönberger 785e602aba Fix last remaining PEP8 errors 2013-05-06 15:32:33 +02:00
Johannes Schönberger cec8516f69 Readd Cellprofiler license notes to edges.py 2013-05-06 12:11:09 +02:00
Johannes Schönberger 231596b351 Add test cases for residuals 2013-05-06 12:08:12 +02:00
Johannes Schönberger 434eb48620 Add test case for underdetermined LineModel estimation 2013-05-06 11:51:20 +02:00
Johannes Schönberger f18eef6bc0 Add title of wikipedia reference 2013-05-06 11:43:52 +02:00
Johannes Schönberger 63577f275c Update doc string of ransac with new validation functions 2013-05-06 11:41:08 +02:00
Johannes Schönberger 252c889427 Add missing double quotes for equations and code 2013-05-06 11:38:46 +02:00
Johannes Schönberger 9e7fb07d67 Add missing double colons for equations 2013-05-06 11:36:38 +02:00
Tony S Yu fa01b936a6 API Change: image_label2rgb changed to label2rgb.
The name change reflects a switch in the argument order (and makes the image an optional argument).
2013-05-06 00:28:11 -05:00
Tony S Yu 29a29721c8 DOC: Change more examples to use image_label2rgb 2013-05-06 00:25:01 -05:00
Tony S Yu 6360240c38 TST: Add tests for image_label2rgb 2013-05-06 00:25:01 -05:00
Tony S Yu 4bd3fe9eb0 ENH: Add some checks on the inputs. 2013-05-06 00:25:01 -05:00
Tony S Yu 90c0ac5c19 Fix: Add setup.py which adds data file to the build 2013-05-06 00:25:01 -05:00
Tony S Yu 19fdad15b9 Add image_label2rgb 2013-05-06 00:25:01 -05:00
Johannes Schönberger 5656feb61b Use double quotes for code in doc string 2013-05-06 07:10:05 +02:00
Johannes Schönberger d6c49ea6b8 Add comment to explain commented out code 2013-05-06 07:08:50 +02:00
Johannes Schönberger ef7b82e116 Clarify SSD description 2013-05-06 07:04:17 +02:00
Johannes Schönberger 43b4e9efb1 Remove extra space 2013-05-06 07:02:37 +02:00
Johannes Schönberger 15e079a8c2 Remove unused shear argument 2013-05-04 11:46:07 +02:00
Johannes Schönberger d857c452d3 Add example matching script 2013-05-04 11:42:43 +02:00
Johannes Schönberger 660a689255 Add reference for RANSAC 2013-05-04 11:41:25 +02:00
Johannes Schönberger c8fa3b48e5 Replace is_degenerate tests with is_data_valid and is_model_valid tests 2013-05-02 18:30:08 +02:00
Johannes Schönberger 8d92f5c02b Remove is_degenerate methods from estimation models 2013-05-02 18:30:08 +02:00
Johannes Schönberger a73076157c Replace is_degenerate with is_model_valid and is_data_valid in ransac 2013-05-02 18:30:08 +02:00
Johannes Schönberger 28bda25da8 Add is_degenerate to description of ransac iteration 2013-05-02 18:30:07 +02:00
Johannes Schönberger db496d0af9 Remove trailing brackets 2013-05-02 18:30:07 +02:00
Johannes Schönberger 82566157f6 Add test case for ransac applied to geometric transform 2013-05-02 18:30:07 +02:00
Johannes Schönberger 22224727d3 Add example for ransac and geometric transforms 2013-05-02 18:30:07 +02:00
Johannes Schönberger fb74a9d8ae Add new stop criteria to ransac and improve doc string 2013-05-02 18:30:07 +02:00
Johannes Schönberger 087fe8891e Fix is_degenerate function to accept src and dst arrays separately 2013-05-02 18:30:07 +02:00
Johannes Schönberger 5da3418fff Change ransac function to accept multiple input data arrays 2013-05-02 18:30:07 +02:00
Johannes Schönberger bf2a5a429b Add residuals method to geometric transforms 2013-05-02 18:30:07 +02:00
Johannes Schönberger 5b78b2a69e Add is_degenerate to geometric transforms 2013-05-02 18:30:07 +02:00
Johannes Schönberger aa309fd926 Replace triple-single-quotes with triple-double-quotes for doc strings 2013-05-02 18:30:07 +02:00
Johannes Schönberger 80827d3959 Add test case for ransac algorithm 2013-05-02 18:30:07 +02:00
Johannes Schönberger e880f155a9 Add test cases for circle model 2013-05-02 18:30:07 +02:00
Johannes Schönberger 53b7e6e418 Add test cases for line model 2013-05-02 18:30:07 +02:00
Johannes Schönberger 44ff37c8ee Fix bug in ellipse model estimation due to changed predict_xy output 2013-05-02 18:30:07 +02:00
Johannes Schönberger c1bb30f625 Return combined xy-coordinate array with arbitrary dimensions in predict_xy 2013-05-02 18:30:07 +02:00
Johannes Schönberger b58f52e40e Fix bug in predict_x of line model 2013-05-02 18:30:06 +02:00
Johannes Schönberger 62b25455dc Add input data shape test to avoid out of memory Jacobians 2013-05-02 18:30:06 +02:00
Johannes Schönberger b2fa37d337 Fix typos 2013-05-02 18:30:06 +02:00
Johannes Schönberger dd714b910c Replace numpy with math for scalar functions and remove Dfun from ellipse residuals for speedup 2013-05-02 18:30:06 +02:00
Johannes Schönberger 444d51ceb7 Calculate initial guess for closest point on ellipse for speedup 2013-05-02 18:30:06 +02:00