Changeset d5f9aea in git


Ignore:
Timestamp:
Jan 11, 2007, 12:27:26 PM (17 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b21a664aa22dc6e196223af8a74ad4885e83547c')
Children:
f1fe4b41ed8869bcf2c89dc6658d3d2b7e9ff6e3
Parents:
dfd08aa8aa2cc94f4a81fa91d1071ec0c4b8fc30
Message:
*hannes: name convention


git-svn-id: file:///usr/local/Singular/svn/trunk@9694 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
kernel
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • kernel/gring.cc

    rdfd08aa rd5f9aea  
    77 *  Author:  levandov (Viktor Levandovsky)
    88 *  Created: 8/00 - 11/00
    9  *  Version: $Id: gring.cc,v 1.34 2007-01-11 10:09:22 Singular Exp $
     9 *  Version: $Id: gring.cc,v 1.35 2007-01-11 11:27:25 Singular Exp $
    1010 *******************************************************************/
    1111#include "mod2.h"
     
    3939{
    4040  poly mc  = p_Neg( p_Copy(m, r), r );
    41   poly mmc = mm_Mult_pp( mc, q, r );
     41  poly mmc = nc_mm_Mult_pp( mc, q, r );
    4242  p_Delete(&mc, r);
    4343
     
    5353                              const int, const ring r)
    5454{
    55   p = p_Add_q(p, mm_Mult_pp( m, q, r ), r);
     55  p = p_Add_q(p, nc_mm_Mult_pp( m, q, r ), r);
    5656
    5757  lp = pLength(p);
     
    11391139  }
    11401140  p2 = p_Mult_nn(p2, C, r);
    1141   poly out = mm_Mult_pp(m, pNext(p1), r);
     1141  poly out = nc_mm_Mult_pp(m, pNext(p1), r);
    11421142  N = p_Add_q(N, out, r);
    11431143  p_Test(p2,r);
     
    12001200  n_Delete(&C,r);
    12011201
    1202   poly out = mm_Mult_pp(m, pNext(p1), r);
     1202  poly out = nc_mm_Mult_pp(m, pNext(p1), r);
    12031203  p_Delete(&m,r);
    12041204
     
    14591459#endif
    14601460  /* pSetComp(m,r)=0? */
    1461   poly M = mm_Mult_pp(m, p1,r);
     1461  poly M = nc_mm_Mult_pp(m, p1,r);
    14621462  number C=p_GetCoeff(M,r);
    14631463  M=p_Add_q(M,mm_Mult_p(m,p_LmDeleteAndNext(p_Copy(p1,r),r),r),r); // _pp?
     
    15141514  pTest(m);
    15151515#endif
    1516   poly pp= mm_Mult_pp(m,p,currRing);
     1516  poly pp= nc_mm_Mult_pp(m,p,currRing);
    15171517  pDelete(&m);
    15181518  number n=nCopy(pGetCoeff(pp));
     
    15681568#endif
    15691569
    1570   poly pp = mm_Mult_pp(m,p,currRing);
     1570  poly pp = nc_mm_Mult_pp(m,p,currRing);
    15711571  pDelete(&m);
    15721572
     
    16161616    return;
    16171617  }
    1618   poly pp = mm_Mult_pp(m,p,currRing);
     1618  poly pp = nc_mm_Mult_pp(m,p,currRing);
    16191619  number c2,cc;
    16201620  pCleardenom_n(pp,c2);
     
    16451645    return;
    16461646  }
    1647   poly pp = mm_Mult_pp(m,p,currRing);
     1647  poly pp = nc_mm_Mult_pp(m,p,currRing);
    16481648  number c2,cc;
    16491649  pCleardenom_n(pp,c2);
     
    16711671  pTest(m);
    16721672#endif
    1673   poly pp=mm_Mult_pp(m,p,currRing);
     1673  poly pp=nc_mm_Mult_pp(m,p,currRing);
    16741674  pDelete(&m);
    16751675  number n=nCopy(pGetCoeff(pp));
     
    17071707  pTest(m);
    17081708#endif
    1709   poly pp=mm_Mult_pp(m, p, currRing);
     1709  poly pp=nc_mm_Mult_pp(m, p, currRing);
    17101710  pDelete(&m);
    17111711
  • kernel/gring.h

    rdfd08aa rd5f9aea  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: gring.h,v 1.16 2007-01-11 10:27:03 Singular Exp $ */
     6/* $Id: gring.h,v 1.17 2007-01-11 11:27:25 Singular Exp $ */
    77/*
    88* ABSTRACT additional defines etc for --with-plural
     
    1111#ifdef HAVE_PLURAL
    1212#include "structs.h"
     13#include "ring.h"
    1314
    1415/* the part, related to the interface */
     
    132133{
    133134  assume((r != NULL) && (r->nc != NULL));
    134 #ifdef HAVE_PLURAL
    135135  r->nc->type = t;
    136 #endif
    137136};
    138137
     
    141140  assume(rIsPluralRing(r));
    142141
    143 #ifdef HAVE_PLURAL
    144142  return (r->nc->type);
    145  #else
    146   return (nc_error); //
    147 #endif
    148143};
    149144
     
    154149
    155150// returns m*p, does neither destroy p nor m
    156 inline poly mm_Mult_pp(const poly m, const poly p, const ring r)
    157 {
    158 #ifdef HAVE_PLURAL
     151inline poly nc_mm_Mult_pp(const poly m, const poly p, const ring r)
     152{
    159153  assume(rIsPluralRing(r));
    160154  assume(r->nc->p_Procs.mm_Mult_pp!=NULL);
    161155  return r->nc->p_Procs.mm_Mult_pp(m, p, r);
    162 #else
    163   Werror("Wrong call to NC function\n");
    164156//  return pp_Mult_mm( p, m, r);
    165 #endif
    166157}
    167158
     
    170161inline poly mm_Mult_p(const poly m, poly p, const ring r)
    171162{
    172 #ifdef HAVE_PLURAL
    173163  assume(rIsPluralRing(r));
    174164  assume(r->nc->p_Procs.mm_Mult_p!=NULL);
    175165  return r->nc->p_Procs.mm_Mult_p(m, p, r);
    176 #else
    177   Werror("Wrong call to NC function\n");
    178166//   return p_Mult_mm( p, m, r);
    179 #endif
    180167}
    181168
    182169inline poly nc_SPoly(const poly p1, const poly p2, const ring r)
    183170{
    184 #ifdef HAVE_PLURAL
    185171  assume(rIsPluralRing(r));
    186172  assume(r->nc->p_Procs.SPoly!=NULL);
    187173  return r->nc->p_Procs.SPoly(p1, p2, r);
    188 #else
    189   Werror("Wrong call to NC function\n");
    190 #endif
    191174}
    192175
    193176inline poly nc_ReduceSPoly(const poly p1, poly p2, const ring r)
    194177{
    195 #ifdef HAVE_PLURAL
    196178  assume(rIsPluralRing(r));
    197179  assume(r->nc->p_Procs.ReduceSPoly!=NULL);
    198180  return r->nc->p_Procs.ReduceSPoly(p1, p2, r);
    199 #else
    200   Werror("Wrong call to NC function\n");
    201 #endif
    202181}
    203182
    204183inline void nc_BucketPolyRed(kBucket_pt b, poly p, number *c)
    205184{
    206 #ifdef HAVE_PLURAL
    207185  assume(rIsPluralRing(currRing));
    208186
     
    211189  assume(currRing->nc->p_Procs.BucketPolyRed!=NULL);
    212190  return currRing->nc->p_Procs.BucketPolyRed(b, p, c);
    213 #else
    214   Werror("Wrong call to NC function\n");
    215 #endif
    216191}
    217192
    218193inline void nc_BucketPolyRed_Z(kBucket_pt b, poly p, number *c)
    219194{
    220 #ifdef HAVE_PLURAL
    221195  assume(rIsPluralRing(currRing));
    222196
     
    226200  return currRing->nc->p_Procs.BucketPolyRed_Z(b, p, c);
    227201
    228 #else
    229   Werror("Wrong call to NC function\n");
    230 #endif
    231202}
    232203
    233204inline ideal nc_GB(const ideal F, const ideal Q, const intvec *w, const intvec *hilb, kStrategy strat)
    234205{
    235 #ifdef HAVE_PLURAL
    236206  assume(rIsPluralRing(currRing));
    237207
     
    250220  }
    251221*/
    252 #else
    253   Werror("Wrong call to NC function\n");
    254 #endif
    255222}
    256223
  • kernel/pInline2.h

    rdfd08aa rd5f9aea  
    77 *  Author:  obachman (Olaf Bachmann)
    88 *  Created: 8/00
    9  *  Version: $Id: pInline2.h,v 1.8 2007-01-03 00:17:11 motsak Exp $
     9 *  Version: $Id: pInline2.h,v 1.9 2007-01-11 11:27:25 Singular Exp $
    1010 *******************************************************************/
    1111#ifndef PINLINE2_H
     
    636636#ifdef HAVE_PLURAL
    637637    if (rIsPluralRing(r))
    638       return mm_Mult_pp(p, q, r);
     638      return nc_mm_Mult_pp(p, q, r);
    639639#endif
    640640    return r->p_Procs->pp_Mult_mm(q, p, r, last);
  • kernel/sca.cc

    rdfd08aa rd5f9aea  
    77 *  Author:  motsak (Oleksandr Motsak)
    88 *  Created: 2006/12/18
    9  *  Version: $Id: sca.cc,v 1.5 2007-01-11 10:08:28 Singular Exp $
     9 *  Version: $Id: sca.cc,v 1.6 2007-01-11 11:27:25 Singular Exp $
    1010 *******************************************************************/
    1111
     
    769769  p_SetCoeff(m2, C1, r);                           // lc(m2) = C1!!!
    770770
    771   poly tmp1 = mm_Mult_pp (m1, pNext(p1), r);    // tmp1 = m1 * tail(p1),
     771  poly tmp1 = nc_mm_Mult_pp (m1, pNext(p1), r);    // tmp1 = m1 * tail(p1),
    772772  p_Delete(&m1,r);  //  => n_Delete(&C1,r);
    773773
    774   poly tmp2 = mm_Mult_pp (m2, pNext(p2), r);    // tmp1 = m2 * tail(p2),
     774  poly tmp2 = nc_mm_Mult_pp (m2, pNext(p2), r);    // tmp1 = m2 * tail(p2),
    775775  p_Delete(&m2,r);  //  => n_Delete(&C1,r);
    776776
     
    848848  n_Delete(&C1,r);
    849849
    850   poly T = mm_Mult_pp(m, pNext(p1), r);
     850  poly T = nc_mm_Mult_pp(m, pNext(p1), r);
    851851  p_Delete(&m, r);
    852852
  • kernel/structs.h

    rdfd08aa rd5f9aea  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: structs.h,v 1.28 2007-01-11 10:58:22 Singular Exp $ */
     6/* $Id: structs.h,v 1.29 2007-01-11 11:27:26 Singular Exp $ */
    77/*
    88* ABSTRACT
     
    415415#ifdef HAVE_PLURAL
    416416// NC pProcs:
    417 typedef poly (*nc_mm_Mult_p_Proc_Ptr)(const poly m, poly p, const ring r);
    418 typedef poly (*nc_mm_Mult_pp_Proc_Ptr)(const poly m, const poly p, const ring r);
    419 
    420 typedef ideal (*nc_GB_Proc_Ptr)(const ideal F, const ideal Q, const intvec *w, const intvec *hilb, kStrategy strat);
    421 
    422 typedef poly (*nc_SPoly_Proc_Ptr)(const poly p1, const poly p2, const ring r);
    423 typedef poly (*nc_SPolyReduce_Proc_Ptr)(const poly p1, poly p2, const ring r);
    424 
    425 typedef void (*nc_Bucket_Proc_Ptr)(kBucket_pt b, poly p, number *c);
     417typedef poly (*mm_Mult_p_Proc_Ptr)(const poly m, poly p, const ring r);
     418typedef poly (*mm_Mult_pp_Proc_Ptr)(const poly m, const poly p, const ring r);
     419
     420typedef ideal (*GB_Proc_Ptr)(const ideal F, const ideal Q, const intvec *w, const intvec *hilb, kStrategy strat);
     421
     422typedef poly (*SPoly_Proc_Ptr)(const poly p1, const poly p2, const ring r);
     423typedef poly (*SPolyReduce_Proc_Ptr)(const poly p1, poly p2, const ring r);
     424
     425typedef void (*bucket_Proc_Ptr)(kBucket_pt b, poly p, number *c);
    426426
    427427struct nc_pProcs
     
    431431  mm_Mult_pp_Proc_Ptr                   mm_Mult_pp;
    432432
    433   Bucket_Proc_Ptr                       BucketPolyRed;
    434   Bucket_Proc_Ptr                       BucketPolyRed_Z;
     433  bucket_Proc_Ptr                       BucketPolyRed;
     434  bucket_Proc_Ptr                       BucketPolyRed_Z;
    435435
    436436  SPoly_Proc_Ptr                        SPoly;
Note: See TracChangeset for help on using the changeset viewer.