Changeset 50fcf4d in tol

Timestamp:

May 19, 2011, 9:50:10 AM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

b0a03cb

Parents:

d4464be

Message:

Refs #1073
Min and Max functions of Matrix didn't show error handling with real arguments but were not working fine.

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@3567 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/btol/matrix_type/matgra.cpp (modified) (1 diff)

tol/btol/matrix_type/matgra.cpp

@@ -844 +844 @@
   for(n=2; args; n++, args=Cdr(args))
   {
-    BMat& b = Mat(args->Car());
-    if((a.Rows()!=b.Rows())||(a.Columns()!=b.Columns())) { break; }
-    for(i=0; i<a.Rows(); i++)
-    {
-      for(j=0; j<a.Columns(); j++)
+    BSyntaxObject* arg = (BSyntaxObject*)args->Car();
+    if(!arg) { continue; }
+    BGrammar* g = arg->Grammar();
+    if(g==GraMatrix()) 
+    { 
+      BMat& b = Mat(arg); 
+      if((a.Rows()!=b.Rows())||(a.Columns()!=b.Columns())) { break; }
+      for(i=0; i<a.Rows(); i++)
       {
-        a(i,j) = (*fun)(a(i,j), b(i,j));
+        for(j=0; j<a.Columns(); j++)
+        {
+          a(i,j) = (*fun)(a(i,j), b(i,j));
+        }
+      }
+    }
+    else if(g==GraReal())
+    {
+      BDat& b = Dat(arg); 
+      for(i=0; i<a.Rows(); i++)
+      {
+        for(j=0; j<a.Columns(); j++)
+        {
+          a(i,j) = (*fun)(a(i,j), b);
+        }
       }
     }