Changeset 261602 in git


Ignore:
Timestamp:
Feb 18, 2013, 11:04:27 PM (11 years ago)
Author:
Martin Lee <martinlee84@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
edb81bb221ceae0874c0570e0ac83e5a84b6f77d
Parents:
1daf0ddfd6bd8856ea1fcf2f6e1f8533f4625c75
Message:
chg: some missing parts of Adi's commit
File:
1 edited

Legend:

Unmodified
Added
Removed
  • Singular/iparith.cc

    r1daf0d r261602  
    6363#include <Singular/linearAlgebra_ip.h>
    6464#ifdef HAVE_FACTORY
     65#  include <factory/factory.h>
    6566#  include <polys/clapsing.h>
    6667#  include <kernel/kstdfac.h>
    67 #endif /* HAVE_FACTORY */
    68 #ifdef HAVE_FACTORY
    6968#  include <kernel/fglm.h>
    7069#  include <Singular/fglm.h>
     
    23512350static BOOLEAN jjGCD_BI(leftv res, leftv u, leftv v)
    23522351{
     2352#ifdef HAVE_FACTORY
     2353  number n1 = (number) u->CopyD();
     2354  number n2 = (number) v->CopyD();
     2355  CanonicalForm C1, C2;
     2356  C1 = coeffs_BIGINT->convSingNFactoryN (n1,TRUE,coeffs_BIGINT);
     2357  C2 = coeffs_BIGINT->convSingNFactoryN (n2,TRUE,coeffs_BIGINT);
     2358  CanonicalForm G = gcd (C1,C2);
     2359  number g = coeffs_BIGINT->convFactoryNSingN (G,coeffs_BIGINT);
     2360  res->data = g;
     2361  return FALSE;
     2362#else
    23532363  number a=(number) u->Data();
    23542364  number b=(number) v->Data();
     
    23642374  }
    23652375  return FALSE;
     2376#endif
    23662377}
    23672378static BOOLEAN jjGCD_N(leftv res, leftv u, leftv v)
Note: See TracChangeset for help on using the changeset viewer.