Distinction between numItermax and maxIter

[vineetbansal]

One is used as max iterations for dissimilarity, the other one for ot.optim.generic_conditional_gradient. We should rename the two to make this distinction clear.

Also the logic here is suspect, and we shouldn't be overriding the argument:

paste3/src/paste3/paste.py

Line 203 in 321ba86

numItermax=maxIter if s else numItermax,