Diff of /inst/geom2d/intersectBoxes.m [347d75] .. [fc6c4c]  Maximize  Restore

  Switch to side-by-side view

--- a/inst/geom2d/intersectBoxes.m
+++ b/inst/geom2d/intersectBoxes.m
@@ -22,47 +22,47 @@
 ## CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 ## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-## -*- texinfo -*-
-## @deftypefn {Function File} {@var{box} =} intersectBoxes (@var{box1}, @var{box2})
-## Intersection of two bounding boxes.
-## 
-##   Example
-##
-## @example
-##   box1 = [5 20 5 30];
-##   box2 = [0 15 0 15];
-##   intersectBoxes(box1, box2)
-##   ans = 
-##       5 15 5 15
-## @end example
-##
-## @seealso{boxes2d, drawBox, mergeBoxes}
-## @end deftypefn
-
-function bb = intersectBoxes(box1, box2)
-
-  # unify sizes of data
-  if size(box1,1) == 1
-      box1 = repmat(box1, size(box2,1), 1);
-  elseif size(box2, 1) == 1
-      box2 = repmat(box2, size(box1,1), 1);
-  elseif size(box1,1) != size(box2,1)
-      error('geom2d:Error',"Bad size for inputs.\n");
-  end
-
-  # compute extreme coords
-  mini = min(box1(:,[2 4]), box2(:,[2 4]));
-  maxi = max(box1(:,[1 3]), box2(:,[1 3]));
-
-  # concatenate result into a new box structure
-  bb = [maxi(:,1) mini(:,1) maxi(:,2) mini(:,2)];
-  
-endfunction
-
-%!test
-%! box1 = [5 20 10 25];
-%! box2 = [0 15 15 20];
-%! res  = [5 15 15 20];
-%! bb = intersectBoxes(box1, box2);
-%! assert (res, bb, 1e-6);
+
+## -*- texinfo -*-
+## @deftypefn {Function File} {@var{box} =} intersectBoxes (@var{box1}, @var{box2})
+## Intersection of two bounding boxes.
+## 
+##   Example
+##
+## @example
+##   box1 = [5 20 5 30];
+##   box2 = [0 15 0 15];
+##   intersectBoxes(box1, box2)
+##   ans = 
+##       5 15 5 15
+## @end example
+##
+## @seealso{boxes2d, drawBox, mergeBoxes}
+## @end deftypefn
+
+function bb = intersectBoxes(box1, box2)
+
+  # unify sizes of data
+  if size(box1,1) == 1
+      box1 = repmat(box1, size(box2,1), 1);
+  elseif size(box2, 1) == 1
+      box2 = repmat(box2, size(box1,1), 1);
+  elseif size(box1,1) != size(box2,1)
+      error('geom2d:Error',"Bad size for inputs.\n");
+  end
+
+  # compute extreme coords
+  mini = min(box1(:,[2 4]), box2(:,[2 4]));
+  maxi = max(box1(:,[1 3]), box2(:,[1 3]));
+
+  # concatenate result into a new box structure
+  bb = [maxi(:,1) mini(:,1) maxi(:,2) mini(:,2)];
+  
+endfunction
+
+%!test
+%! box1 = [5 20 10 25];
+%! box2 = [0 15 15 20];
+%! res  = [5 15 15 20];
+%! bb = intersectBoxes(box1, box2);
+%! assert (res, bb, 1e-6);

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:





No, thanks