Changeset 32a2e1 in git for Singular/iparith.cc


Ignore:
Timestamp:
Jul 26, 2008, 2:40:43 PM (16 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
050191fa505b5f43867ff2f00f542f9dbbb6735a
Parents:
e5dcf2e9b0937447ac576a41bc6bf66d961d5419
Message:
*hannes: better error message for matrix


git-svn-id: file:///usr/local/Singular/svn/trunk@10916 2c84dea3-7e68-4137-9b89-c4e89433aadc
File:
1 edited

Legend:

Unmodified
Added
Removed

  • Singular/iparith.cc

    re5dcf2e r32a2e1  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: iparith.cc,v 1.474 2008-07-16 12:41:32 wienand Exp $ */
     4/* $Id: iparith.cc,v 1.475 2008-07-26 12:40:43 Singular Exp $ */
    55
    66/*
    … …  
    892892static BOOLEAN jjPLUS_MA(leftv res, leftv u, leftv v)
    893893{
    894   res->data = (char *)(mpAdd((matrix)u->Data() , (matrix)v->Data()));
     894  matrix A=(matrix)u->Data(); matrix B=(matrix)v->Data();
     895  res->data = (char *)(mpAdd(A , B));
    895896  if (res->data==NULL)
    896897  {
    897      WerrorS("matrix size not compatible");
     898     Werror("matrix size not compatible(%dx%d, %dx%d)",
     899             MATROWS(A),MATCOLS(A),MATROWS(B),MATCOLS(B));
    898900     return TRUE;
    899901  }
    … …  
    969971static BOOLEAN jjMINUS_MA(leftv res, leftv u, leftv v)
    970972{
    971   res->data = (char *)(mpSub((matrix)u->Data() , (matrix)v->Data()));
     973  matrix A=(matrix)u->Data(); matrix B=(matrix)v->Data();
     974  res->data = (char *)(mpSub(A , B));
    972975  if (res->data==NULL)
    973976  {
    974      WerrorS("matrix size not compatible");
     977     Werror("matrix size not compatible(%dx%d, %dx%d)",
     978             MATROWS(A),MATCOLS(A),MATROWS(B),MATCOLS(B));
    975979     return TRUE;
    976980  }
    … …  
    10931097static BOOLEAN jjTIMES_MA(leftv res, leftv u, leftv v)
    10941098{
    1095   res->data = (char *)mpMult((matrix)u->Data(),(matrix)v->Data());
     1099  matrix A=(matrix)u->Data(); matrix B=(matrix)v->Data();
     1100  res->data = (char *)mpMult(A,B);
    10961101  if (res->data==NULL)
    10971102  {
    1098      WerrorS("matrix size not compatible");
     1103     Werror("matrix size not compatible(%dx%d, %dx%d)",
     1104             MATROWS(A),MATCOLS(A),MATROWS(B),MATCOLS(B));
    10991105     return TRUE;
    11001106  }
Note: See TracChangeset for help on using the changeset viewer.