Merge branch 'release-3.0.1-branch'

jeanluct · Dec 16, 2014 · a7aca60 · a7aca60
2 parents 5beccd3 + 092a125
commit a7aca60
Show file tree

Hide file tree

Showing 24 changed files with 1,667 additions and 548 deletions.
diff --git a/+braidlab/@braid/braid.m b/+braidlab/@braid/braid.m
@@ -367,6 +367,10 @@
                  '  Instead use matrix of loop.coords.  ' ...
                  'Try ''help loop.loop''.'])
         end
+        if b1.n > b2.totaln
+          error('BRAIDLAB:braid:mtimes:badgen', ...
+                'Braid has too many strings for the loop.')
+        end
         if b2.basepoint
           p = b1.perm;
           p = [p (length(p)+1):b2.totaln];
@@ -375,10 +379,6 @@
                   'Braid cannot move the basepoint.')
           end
         end
-        if b1.n > b2.n
-          error('BRAIDLAB:braid:mtimes:badgen', ...
-                'Braid has too many strings for the loop.')
-        end
         [varargout{1:nargout}] = loopsigma(b1.word,b2.coords);
         varargout{1} = braidlab.loop(varargout{1},'bp',b2.basepoint);
         if nargout > 1

diff --git a/+braidlab/@braid/private/find_reducing_curves.m b/+braidlab/@braid/private/find_reducing_curves.m