[BACK]Return to array.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / builtin

Diff for /OpenXM_contrib2/asir2000/builtin/array.c between version 1.4 and 1.8

version 1.4, 2000/05/29 08:54:44 version 1.8, 2000/09/21 09:19:25
Line 1 
Line 1 
 /* $OpenXM: OpenXM_contrib2/asir2000/builtin/array.c,v 1.3 2000/04/20 02:20:15 noro Exp $ */  /*
    * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED
    * All rights reserved.
    *
    * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited,
    * non-exclusive and royalty-free license to use, copy, modify and
    * redistribute, solely for non-commercial and non-profit purposes, the
    * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and
    * conditions of this Agreement. For the avoidance of doubt, you acquire
    * only a limited right to use the SOFTWARE hereunder, and FLL or any
    * third party developer retains all rights, including but not limited to
    * copyrights, in and to the SOFTWARE.
    *
    * (1) FLL does not grant you a license in any way for commercial
    * purposes. You may use the SOFTWARE only for non-commercial and
    * non-profit purposes only, such as academic, research and internal
    * business use.
    * (2) The SOFTWARE is protected by the Copyright Law of Japan and
    * international copyright treaties. If you make copies of the SOFTWARE,
    * with or without modification, as permitted hereunder, you shall affix
    * to all such copies of the SOFTWARE the above copyright notice.
    * (3) An explicit reference to this SOFTWARE and its copyright owner
    * shall be made on your publication or presentation in any form of the
    * results obtained by use of the SOFTWARE.
    * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
    * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
    * for such modification or the source code of the modified part of the
    * SOFTWARE.
    *
    * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL
    * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND
    * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
    * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES'
    * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY
    * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY.
    * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT,
    * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY
    * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
    * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES
    * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES
    * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY
    * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF
    * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART
    * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
    * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
    * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
    *
    * $OpenXM: OpenXM_contrib2/asir2000/builtin/array.c,v 1.7 2000/08/22 05:03:56 noro Exp $
   */
 #include "ca.h"  #include "ca.h"
 #include "base.h"  #include "base.h"
 #include "parse.h"  #include "parse.h"
Line 309  VECT *rp;
Line 357  VECT *rp;
   
         asir_assert(ARG0(arg),O_N,"newvect");          asir_assert(ARG0(arg),O_N,"newvect");
         len = QTOS((Q)ARG0(arg));          len = QTOS((Q)ARG0(arg));
         if ( len <= 0 )          if ( len < 0 )
                 error("newvect : invalid size");                  error("newvect : invalid size");
         MKVECT(vect,len);          MKVECT(vect,len);
         if ( argc(arg) == 2 ) {          if ( argc(arg) == 2 ) {
Line 340  MAT *rp;
Line 388  MAT *rp;
         asir_assert(ARG0(arg),O_N,"newmat");          asir_assert(ARG0(arg),O_N,"newmat");
         asir_assert(ARG1(arg),O_N,"newmat");          asir_assert(ARG1(arg),O_N,"newmat");
         row = QTOS((Q)ARG0(arg)); col = QTOS((Q)ARG1(arg));          row = QTOS((Q)ARG0(arg)); col = QTOS((Q)ARG1(arg));
         if ( row <= 0 || col <= 0 )          if ( row < 0 || col < 0 )
                 error("newmat : invalid size");                  error("newmat : invalid size");
         MKMAT(m,row,col);          MKMAT(m,row,col);
         if ( argc(arg) == 3 ) {          if ( argc(arg) == 3 ) {
Line 664  int row,col,md;
Line 712  int row,col,md;
                         t = mat[i];                          t = mat[i];
                         if ( i != j && (a = t[j]) )                          if ( i != j && (a = t[j]) )
                                 for ( k = j, a = md - a; k <= n; k++ ) {                                  for ( k = j, a = md - a; k <= n; k++ ) {
                                           unsigned int tk;
 /*                                      t[k] = dmar(pivot[k],a,t[k],md); */  /*                                      t[k] = dmar(pivot[k],a,t[k],md); */
                                         DMAR(pivot[k],a,t[k],md,t[k])                                          DMAR(pivot[k],a,t[k],md,tk)
                                           t[k] = tk;
                                 }                                  }
                 }                  }
         }          }
Line 1414  int *perm;
Line 1464  int *perm;
                                 DMAR(inv,m,0,md,t[k])                                  DMAR(inv,m,0,md,t[k])
                                 for ( j = k+1, m = md - t[k]; j < col; j++ )                                  for ( j = k+1, m = md - t[k]; j < col; j++ )
                                         if ( pivot[j] ) {                                          if ( pivot[j] ) {
                                                 DMAR(m,pivot[j],t[j],md,t[j])                                                  unsigned int tj;
   
                                                   DMAR(m,pivot[j],t[j],md,tj)
                                                   t[j] = tj;
                                         }                                          }
                         }                          }
                 }                  }
Line 1469  int **rinfo,**cinfo;
Line 1522  int **rinfo,**cinfo;
                                 DMAR(inv,m,0,md,t[k])                                  DMAR(inv,m,0,md,t[k])
                                 for ( j = k+1, m = md - t[k]; j < col; j++ )                                  for ( j = k+1, m = md - t[k]; j < col; j++ )
                                         if ( pivot[j] ) {                                          if ( pivot[j] ) {
                                                 DMAR(m,pivot[j],t[j],md,t[j])                                                  unsigned int tj;
                                                   DMAR(m,pivot[j],t[j],md,tj)
                                                   t[j] = tj;
                                         }                                          }
                         }                          }
                 }                  }
Line 2418  int row,col;
Line 2473  int row,col;
   
         for ( i = 0; i < row; i++ ) {          for ( i = 0; i < row; i++ ) {
                 for ( j = 0; j < col; j++ ) {                  for ( j = 0; j < col; j++ ) {
                         printnum(mat[i][j]); printf(" ");                          printnum((Num)mat[i][j]); printf(" ");
                 }                  }
                 printf("\n");                  printf("\n");
         }          }
Legend:
Removed from v.1.4  
changed lines
  Added in v.1.8
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>