Zachary Pincus
4a0e4e2285
Oops: actually fix heap performance problem...
2010-04-08 18:13:45 -04:00
Zachary Pincus
56a5cadde2
Performance fix for heap; correctness for _mcp
...
(1) normalize_indices in _mcp.pyx should convert indices to ints: fixed
(2) huge (order of magnitude) performance problems in heap.pyx from changing
lines like:
ii = (i-1)/2 # CalcPrevAbs
to:
ii = (int)(i-1)/2 # CalcPrevAbs
for some reason, the latter goes through the python division machinery!
However, the former is invalid for cython >=0.12, so the proper solution is:
ii = (i-1)//2 # CalcPrevAbs
2010-04-08 18:11:47 -04:00
Stefan van der Walt
bc8ab59966
graph: mcp: Clean up long lines. Fix tests.
2010-01-01 13:24:32 +02:00
Stefan van der Walt
83efa5f109
morphology: Clean setup.
2010-01-01 13:08:33 +02:00
Stefan van der Walt
93c90377c3
graph: spath: Fix documentation indentation.
2010-01-01 13:01:56 +02:00
Stefan van der Walt
b7706e6550
graph: heap: Cast known integer after division.
2009-12-31 10:54:25 +02:00
Zachary Pincus
07fbf605b2
Fix heap.pyx to work when infinite values are pushed.
2009-12-30 14:31:08 -05:00
Zachary Pincus
ad141b680d
Finish commits of changes to graph: __init__ and setup and remove old cruft.
2009-12-29 13:31:55 -05:00
Zachary Pincus
8b2a8b5031
Rewrite spath.shortest_path to use new mcp classes
...
spath.shortest_path presents the same interface, but now uses the new mcp
classes internally, which means that it is now fully n-d, and can also find
the shortest path along any given axis. The old output format has been
retained, but is a bit weird for non-2d arrays. A more sensible n-d output
format is available, but not enabled by default.
2009-12-29 13:17:18 -05:00
Zachary Pincus
6f39426485
Added classes for minimum-cost-pathfinding through n-d arrays.
...
mcp.py presents the interface and a simple usage example; the classes of
interest are in _mcp.pyx. Basic tests are included.
2009-12-29 13:05:53 -05:00
Zachary Pincus
4741c113ca
Add fast binary heap classes (from Almar Klein)
...
cython classes for fast binary heaps (that store (value, reference) pairs) are
now available from scikits.image.graph.heap
2009-12-29 13:04:22 -05:00
Zachary Pincus
17edd0cc29
Modify _build.py:cython() to be cleaner:
...
(1) Now uses subprocess.call instead of os.system, so that paths with spaces
(and the like) are handled properly.
(2) Removes superfluous .c.new files after deciding whether or not to copy
them to the .c files.
2009-12-29 12:38:31 -05:00
Stefan van der Walt
2ebfcdce75
Add docs for logger.
2009-12-03 10:12:02 +02:00
Stefan van der Walt
bd79e3741e
Add easy way to grab a logger.
2009-12-03 10:01:29 +02:00
Stefan van der Walt
b0d28687c9
docs: Fix typo.
2009-12-03 09:58:00 +02:00
Stefan van der Walt
7dbbf8b397
Cython division fixes. Ignore version file after build.
2009-12-03 09:45:20 +02:00
Stefan van der Walt
dbbfb6e3e5
spath: Add Cython definition file to allow external use.
2009-12-03 09:36:56 +02:00
Stefan van der Walt
04fcbb0c53
Restore version file.
2009-12-03 09:36:10 +02:00
Stefan van der Walt
b22d10e2c8
spath: Remove debug prints.
2009-11-24 01:22:00 +02:00
Stefan van der Walt
e3b5e09a34
trace_path: reformat docs
2009-11-22 13:27:15 +02:00
Stefan van der Walt
dc6715bc08
trace_path: Add tests.
2009-11-22 13:20:41 +02:00
Stefan van der Walt
a0b2430726
trace_path: PEP7 fixes.
2009-11-22 13:15:19 +02:00
Stefan van der Walt
81c4019887
Add Zachy Pincus's trace_path routine for finding a low-cos path between a given start and end point.
2009-11-22 13:09:20 +02:00
Stefan van der Walt
870d2efc92
morphology: Wrap long lines.
2009-11-20 11:31:34 +02:00
Stefan van der Walt
372775029b
Merge branch 'damian-morphology' of git://github.com/deads/scikits.image into damian
...
Conflicts:
scikits/image/setup.py
2009-11-20 11:27:09 +02:00
Damian Eads
56056cb40f
Regression tests for morphology
2009-11-18 23:47:15 -08:00
Damian Eads
f7f294ccf1
Regression tests written for morphology
2009-11-18 22:59:34 -08:00
Stefan van der Walt
816640e890
Merge branch 'compatibility2.5' of git://github.com/tonysyu/scikits.image
2009-11-12 23:27:29 +02:00
Stefan van der Walt
0011fd17c6
io: Remove unneccesary import.
2009-11-12 22:34:58 +02:00
Stefan van der Walt
f9cf7760a0
io: Fix doctests.
2009-11-12 22:34:39 +02:00
Stefan van der Walt
0f604fa07e
io: Add null-plugin to simplify testing.
2009-11-12 22:34:19 +02:00
Stefan van der Walt
44c6c19234
Fix with statement for 2.5.
2009-11-12 22:13:19 +02:00
Tony
14975cb891
Rewrite as_grey property without enhanced property decorators to be python 2.5 compliant
2009-11-12 10:53:12 -05:00
Stefan van der Walt
9d64d8d0dc
setup: Fix Cython build.
2009-11-12 14:21:36 +02:00
Stefan van der Walt
1b501c83e1
setup: Only check for new Cython file if Cython executed successfully.
2009-11-12 14:11:51 +02:00
Stefan van der Walt
8099c35b31
Revert accidental change out of version.py
2009-11-12 13:58:17 +02:00
sccolbert
84f9c60bf4
added cvUndistort2 and its tests
2009-11-11 14:49:23 +01:00
sccolbert
152c6209c8
finished the lut tables
2009-11-10 05:12:23 +01:00
sccolbert
30048f2414
Fixed a small but serious bug in cvCvtColor.
2009-11-09 22:57:14 +01:00
Stefan van der Walt
ca7e337144
Merge branch 'io'
...
Conflicts:
scikits/image/analysis/spath.c
scikits/image/setup.py
2009-11-09 00:02:30 +02:00
Stefan van der Walt
d8709bd0c0
io: Add imsave using PIL.
2009-11-08 23:49:51 +02:00
Stefan van der Walt
d9f624959f
io: Throw exception when qt plugin can't be loaded.
2009-11-08 22:08:42 +02:00
Stefan van der Walt
c539a02b20
io: Fix one more instance of cdivision.
2009-11-08 22:02:15 +02:00
Stefan van der Walt
6c1bbc0297
Merge branch 'threadingio' of git://github.com/sccolbert/scikits.image into io
2009-11-08 20:30:07 +02:00
sccolbert
625291f361
added division decorators to cython. Improved how data gets chunked up.
2009-11-08 18:35:07 +01:00
Stefan van der Walt
2ac29d6fa8
Merge branch 'threadingio' of git://github.com/sccolbert/scikits.image into io
2009-11-08 11:07:57 +02:00
sccolbert
a6de1409e0
added try except to deal with missing multiprocessing.
2009-11-08 09:13:40 +01:00
Stefan van der Walt
db7583b62a
io: Move plugin tests to io/tests.
2009-11-08 09:44:52 +02:00
Stefan van der Walt
67e0cb03ea
Merge branch 'io' of git://github.com/sccolbert/scikits.image into io
...
Conflicts:
scikits/image/io/_plugins/qt_plugin.py
2009-11-08 09:44:00 +02:00
sccolbert
4beb9eb16b
added better logic to the thread dispatcher.
2009-11-08 05:39:02 +01:00