Changeset 779a21 in git


Ignore:
Timestamp:
Mar 22, 2000, 6:14:56 PM (24 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '648d28f488f6ff08f5607ff229b9ad9e4a5b93c2')
Children:
3c49a46bb44fc187a6364954e04cc7833458140b
Parents:
4301a7d4e7af18768ce85c52e3d7744fa3c51348
Message:
*hannes: NULL access fixed


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

Legend:

Unmodified
Added
Removed
  • Singular/polys-impl.cc

    r4301a7 r779a21  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: polys-impl.cc,v 1.38 2000-03-22 17:07:25 Singular Exp $ */
     4/* $Id: polys-impl.cc,v 1.39 2000-03-22 17:14:56 Singular Exp $ */
    55
    66/***************************************************************
     
    10041004  int i,j;
    10051005  // check fur syzcomp - special case, not visible in currRing->order
    1006   if ((currRing->typ[0].ord_typ==ro_syz)
     1006  if ((currRing->typ!=NULL)
     1007  && (currRing->typ[0].ord_typ==ro_syz)
    10071008  && (pGetComp(p1)!=pGetComp(p2)))
    10081009  {
     
    10871088        r=rComp_deg(p1,p2,i);
    10881089        if (r!=0) { assume(r==rr);return rr;}
    1089         r=rComp_lex(p1,p2,i);
     1090        r=rComp_lex(p1,p2,i);
    10901091        if (r!=0) { assume(r==rr);return rr;}
    10911092        break;
     
    11011102        r= -rComp_deg(p1,p2,i);
    11021103        if (r!=0) { assume(r==rr);return rr;}
    1103         r=rComp_lex(p1,p2,i);
     1104        r=rComp_lex(p1,p2,i);
    11041105        if (r!=0) { assume(r==rr);return rr;}
    11051106        break;
     
    11151116        r=rComp_a(p1,p2,i);
    11161117        if (r!=0) { assume(r==rr);return rr;}
    1117         r=rComp_lex(p1,p2,i);
     1118        r=rComp_lex(p1,p2,i);
    11181119        if (r!=0) { assume(r==rr);return rr;}
    11191120        break;
     
    11291130        r= -rComp_a(p1,p2,i);
    11301131        if (r!=0) { assume(r==rr);return rr;}
    1131         r=rComp_lex(p1,p2,i);
     1132        r=rComp_lex(p1,p2,i);
    11321133        if (r!=0) { assume(r==rr);return rr;}
    11331134        break;
     
    11391140      case ringorder_s:
    11401141        /*  ro_syz */
    1141         // shall not appear:
    1142         assume(0);
    1143         #if 0
    1144         if ((pGetComp(p1) > pDBsyzComp) && (pGetComp(p2) > pDBsyzComp)) break;
    1145         if ((pGetComp(p1) <= pDBsyzComp) && (pGetComp(p2) <= pDBsyzComp)) break;
    1146         if (pGetComp(p1) <= pDBsyzComp) { assume(rr==1); return rr;}
    1147         /* if (pGetComp(p2) <= pDBsyzComp) */ { assume (rr== -1); return rr; }
    1148         #endif
    1149         return rr;
     1142        // shall not appear:
     1143        assume(0);
     1144        #if 0
     1145        if ((pGetComp(p1) > pDBsyzComp) && (pGetComp(p2) > pDBsyzComp)) break;
     1146        if ((pGetComp(p1) <= pDBsyzComp) && (pGetComp(p2) <= pDBsyzComp)) break;
     1147        if (pGetComp(p1) <= pDBsyzComp) { assume(rr==1); return rr;}
     1148        /* if (pGetComp(p2) <= pDBsyzComp) */ { assume (rr== -1); return rr; }
     1149        #endif
     1150        return rr;
    11501151
    11511152      case ringorder_unspec:
Note: See TracChangeset for help on using the changeset viewer.