Plotsiftdescriptor.py [Conflicts resolved] #23

simmimourya · 2016-07-01T08:58:15Z

Plotsiftdescriptor

Synced with master.
Results generated using updated sift logic.
Examples included in doc-string.

Example Usage:

>>> result = sift(img, compute_descriptor=True)
>>> F = result[0]
>>> D = result[1]
>>> plotsiftdescriptor(D, F) 
# Default f will be used in this case.
>>> plotsiftdescriptor(D)

Results:

plotsiftdescriptor(d)
plotsiftdescriptor(d, f)

2. F argument in plotsiftdescriptor() goes optional. 3. Add function docstring with example usage.

2. Handle case: f.shape[1] == 4 3. Handle case: max_value == 0:

2. Fortran Order x1 and y1. x1 = x_center.flatten('F') y1 = y_center.flatten('F')

the array defined above named 'nans'. Why x_stars and y_stars are assigned with correct dimensions which is not the case while using nans.

while populating x_render. Same goes with y_render. 2. More Readble variable names.

Why Remove conflicts bw populated and already defined x and y. 2. Choose correct slice which was incorrect earlier. eg. f[k, 2] -> f[2, k]

Earlier: f[0]/d[0] was written inplace of f[1]/d[1] respectively and vice versa.

menpobot · 2016-07-01T08:58:16Z

Can one of the admins verify this patch?

Simmi Mourya and others added 21 commits June 30, 2016 12:07

vl plotsiftdescriptor added. Siftdescriptor added in Cysift.pyx

d6c695c

1. Optimize imports.

a129068

2. F argument in plotsiftdescriptor() goes optional. 3. Add function docstring with example usage.

Stack correct split outputs of f.

c240f4d

Compare shape of correct axis of f.

7203574

1. Handle case: f.shape[1] == 3

d0dbe85

2. Handle case: f.shape[1] == 4 3. Handle case: max_value == 0:

Add correct docstring for render_descr()

bd2ee7a

Assign correct values to x_center and y_center.

19cd367

Remove last value from th list. th = th[:-2]

4b8ff2a

1. nan array initialized with correct syntax.

05f251e

2. Fortran Order x1 and y1. x1 = x_center.flatten('F') y1 = y_center.flatten('F')

Assign new array 'nans1' with different dimensions instead of using

0bfdc6d

the array defined above named 'nans'. Why x_stars and y_stars are assigned with correct dimensions which is not the case while using nans.

1. Fortran ordering used to flatten x_stars, x_horizontal, x_vertical

1f57d3f

while populating x_render. Same goes with y_render. 2. More Readble variable names.

1. Populate 'a' with results of render_descr().

0a8bc27

Why Remove conflicts bw populated and already defined x and y. 2. Choose correct slice which was incorrect earlier. eg. f[k, 2] -> f[2, k]

Decrease Linewidth to 0.5 while plotting.

47be4d7

remove appveyor.yml (move to Windows Jenkins)

fce5c3a

Add plt.show()

d4af599

Remove cy_siftdescriptor() definition. (Added accidently).

8efb36d

Merge remote-tracking branch 'origin/master' into Plotsiftdescriptor-3

adcb0c4

Add utils.py

0f918ea

1. Handle None 'F' argument.

208d7d4

Compare right dimensions now.

e89df47

Earlier: f[0]/d[0] was written inplace of f[1]/d[1] respectively and vice versa.

Remove Sift import (not required).

2f4848c

Fix Example in documentation

b2d6d93

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Plotsiftdescriptor.py [Conflicts resolved] #23

Plotsiftdescriptor.py [Conflicts resolved] #23

simmimourya commented Jul 1, 2016

menpobot commented Jul 1, 2016

Plotsiftdescriptor.py [Conflicts resolved] #23

Are you sure you want to change the base?

Plotsiftdescriptor.py [Conflicts resolved] #23

Conversation

simmimourya commented Jul 1, 2016

menpobot commented Jul 1, 2016