wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-06 05:16:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add input data shape test to avoid out of memory Jacobians

Browse Source
This commit is contained in:
Johannes Schönberger
2013-05-01 10:30:32 +02:00
parent b2fa37d337
commit 62b25455dc
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/measure/fit.py
+17
View File
@@ -3,6 +3,11 @@ import numpy as np
from scipy import optimize
def _check_data_dim(data, dim):
if data.ndim != 2 or data.shape[1] != dim:
raise ValueError('Input data must have shape (N, %d).' % dim)
class BaseModel(object):
def __init__(self):
@@ -42,6 +47,8 @@ class LineModel(BaseModel):
'''
_check_data_dim(data, dim=2)
X0 = data.mean(axis=0)
if data.shape[0] == 2: # well determined
@@ -78,6 +85,8 @@ class LineModel(BaseModel):
'''
_check_data_dim(data, dim=2)
dist, theta = self._params
x = data[:, 0]
@@ -179,6 +188,8 @@ class CircleModel(BaseModel):
'''
_check_data_dim(data, dim=2)
x = data[:, 0]
y = data[:, 1]
# pre-allocate jacobian for all iterations
@@ -226,6 +237,8 @@ class CircleModel(BaseModel):
'''
_check_data_dim(data, dim=2)
xc, yc, r = self._params
x = data[:, 0]
@@ -319,6 +332,8 @@ class EllipseModel(BaseModel):
'''
_check_data_dim(data, dim=2)
x = data[:, 0]
y = data[:, 1]
@@ -392,6 +407,8 @@ class EllipseModel(BaseModel):
'''
_check_data_dim(data, dim=2)
xc, yc, a, b, theta = self._params
ctheta = math.cos(theta)