Changeset 704325e in git


Ignore:
Timestamp:
Nov 17, 1999, 11:51:04 AM (25 years ago)
Author:
Olaf Bachmann <obachman@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '648d28f488f6ff08f5607ff229b9ad9e4a5b93c2')
Children:
87e389f2290616eea082667d75d97af307831fdc
Parents:
97d3c00617cfd87ee2359033f8b2ae1bbf23a456
Message:
* Assure_C_dp enabled (fixed  rCurrRingAssure_Global)


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

Legend:

Unmodified
Added
Removed
  • Singular/extra.cc

    r97d3c0 r704325e  
    22*  Computer Algebra System SINGULAR      *
    33*****************************************/
    4 /* $Id: extra.cc,v 1.116 1999-11-16 12:39:26 obachman Exp $ */
     4/* $Id: extra.cc,v 1.117 1999-11-17 10:51:04 obachman Exp $ */
    55/*
    66* ABSTRACT: general interface to internals of Singular ("system" command)
     
    5151#include "feOpt.h"
    5252#include "distrib.h"
     53#include "prCopy.h"
    5354
    5455// Define to enable many more system commands
     
    11161117    else
    11171118#endif
     1119/*==================== thomas =================*/
     1120    if (strcmp(sys_cmd, "thomas") == 0)
     1121    {
     1122      poly p = (poly) h->Data();
     1123      ring cr = currRing;
     1124      ring r = rCurrRingAssure_C_dp();
     1125      poly p_r = prCopyR(p, cr);
     1126      pTest(p_r);
     1127      pWrite(p_r);
     1128      rChangeCurrRing(cr, TRUE);
     1129      return FALSE;
     1130    }
    11181131/*==================== Error =================*/
    11191132      Werror( "system(\"%s\",...) %s", sys_cmd, feNotImplemented );
  • Singular/ring.cc

    r97d3c0 r704325e  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ring.cc,v 1.82 1999-11-15 17:20:44 obachman Exp $ */
     4/* $Id: ring.cc,v 1.83 1999-11-17 10:51:02 obachman Exp $ */
    55
    66/*
     
    8080void rChangeCurrRing(ring r, BOOLEAN complete)
    8181{
    82   rTest(r);
    8382  /*------------ set global ring vars --------------------------------*/
    8483  currRing = r;
     
    8685  if (r != NULL)
    8786  {
     87    rTest(r);
    8888    if (complete)
    8989    {
     
    894894      idDelete(&r->qideal);
    895895      r->qideal=NULL;
    896       rChangeCurrRing(savecurrRing,FALSE);
     896      rChangeCurrRing(savecurrRing,TRUE);
    897897    }
    898898    int i=1;
     
    33373337 
    33383338
    3339 // use this fro global ordering consisting of two blocks
     3339// use this for global orderings consisting of two blocks
    33403340static ring rCurrRingAssure_Global(rRingOrder_t b1, rRingOrder_t b2)
    33413341{
    33423342  int r_blocks = rBlocks(currRing);
    33433343  int i;
     3344 
     3345  assume(b1 == ringorder_c || b1 == ringorder_C ||
     3346         b2 == ringorder_c || b1 == ringorder_C ||
     3347         b2 == ringorder_S);
    33443348 
    33453349  if (r_blocks == 2 && currRing->order[0] == b1 && currRing->order[2] == 0)
     
    33533357  res->order[0] = b1;
    33543358  res->order[1] = b2;
    3355   res->block0[0] = 1;
    3356   res->block1[0] = currRing->N;
     3359  if (b1 == ringorder_c || b1 == ringorder_C)
     3360  {
     3361    res->block0[1] = 1;
     3362    res->block1[1] = currRing->N;
     3363  }
     3364  else
     3365  {
     3366    res->block0[0] = 1;
     3367    res->block1[0] = currRing->N;
     3368  }
     3369  // HANNES: This sould be set in rComplete
    33573370  res->OrdSgn = 1;
    33583371  rComplete(res, 1);
     
    33723385}
    33733386
     3387ring rCurrRingAssure_C_dp()
     3388{
     3389  return rCurrRingAssure_Global(ringorder_C, ringorder_dp);
     3390}
     3391
     3392
    33743393void rSetSyzComp(int k)
    33753394{
  • Singular/ring.h

    r97d3c0 r704325e  
    77* ABSTRACT - the interpreter related ring operations
    88*/
    9 /* $Id: ring.h,v 1.40 1999-11-15 17:20:45 obachman Exp $ */
     9/* $Id: ring.h,v 1.41 1999-11-17 10:51:04 obachman Exp $ */
    1010
    1111/* includes */
     
    195195ring   rCurrRingAssure_dp_S();
    196196ring   rCurrRingAssure_dp_C();
     197ring   rCurrRingAssure_C_dp();
    197198// return the max-comonent wchich has syzIndex i
    198199// Assume: i<= syzIndex_limit
Note: See TracChangeset for help on using the changeset viewer.