Changeset a3d94c in git


Ignore:
Timestamp:
Aug 4, 2011, 3:21:06 PM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
aec3112fdfcad6d6827263a54d4b4e15e771295b
Parents:
6d9d85c1fd472850e2c09503b3ffc7317679da3d
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-04 15:21:06+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:14:26+01:00
Message:
FIX: finxing a circular dependency due to kbuckets.h and pShallowCopyDelete.h
Location:
libpolys/polys
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • libpolys/polys/kbuckets.cc

    r6d9d85 ra3d94c  
    1414//#include <kernel/kutil.h>
    1515#include <polys/kbuckets.h>
     16
     17// #include <polys/operations/pShallowCopyDelete.h>
     18
    1619
    1720#ifdef HAVE_COEF_BUCKETS

  • libpolys/polys/kbuckets.h

    r6d9d85 ra3d94c  
    55****************************************/
    66/* $Id$ */
    7 #include <polys/operations/pShallowCopyDelete.h>
    87#include <polys/monomials/ring.h>
    98#include <polys/templates/p_Procs.h>

  • libpolys/polys/monomials/ring.h

    r6d9d85 ra3d94c  
    5757typedef void     (*p_SetmProc)(poly p, const ring r);
    5858
     59
     60/// returns a poly from dest_r which is a ShallowCopy of s_p from source_r
     61/// assumes that source_r->N == dest_r->N and that orderings are the same
     62typedef poly (*pShallowCopyDeleteProc)(poly s_p, ring source_r, ring dest_r,
     63                                       omBin dest_bin);
    5964
    6065

  • libpolys/polys/operations/pShallowCopyDelete.cc

    r6d9d85 ra3d94c  
    1010 *******************************************************************/
    1111#include "config.h"
    12 #include <polys/monomials/p_polys.h>
    13 #include <polys/monomials/ring.h>
    14 #include <polys/operations/pShallowCopyDelete.h>
     12#include "pShallowCopyDelete.h"
    1513
    1614// a simple implementations

  • libpolys/polys/operations/pShallowCopyDelete.h

    r6d9d85 ra3d94c  
    99 *  Version: $Id$
    1010 *******************************************************************/
     11#ifndef PSHALLOWCOPYDELETE_H
     12#define PSHALLOWCOPYDELETE_H
    1113
    12 // returns a poly from dest_r which is a ShallowCopy of s_p from source_r
    13 // assumes that source_r->N == dest_r->N and that orderings are the same
    14 typedef poly (*pShallowCopyDeleteProc)(poly s_p, ring source_r, ring dest_r,
    15                                        omBin dest_bin);
     14#include <polys/monomials/p_polys.h>
     15#include <polys/monomials/ring.h>
     16
    1617pShallowCopyDeleteProc pGetShallowCopyDeleteProc(ring source_r, ring dest_r);
    1718
     19#endif // PSHALLOWCOPYDELETE_H

  • libpolys/polys/operations/p_Mult_q.cc

    r6d9d85 ra3d94c  
    1616#endif
    1717
    18 /***************************************************************
    19  *
    20  * Returns:  p * q,
    21  * Destroys: if !copy then p, q
    22  * Assumes: pLength(p) >= 2 pLength(q) >=2
    23  ***************************************************************/
    2418#include <misc/options.h>
     19
    2520#include <polys/monomials/p_polys.h>
    2621#include <polys/templates/p_Procs.h>
    … …  
    3126#include <polys/kbuckets.h>
    3227
    33 #include <polys/operations/p_Mult_q.h>
     28#include "p_Mult_q.h"
     29
    3430
    3531BOOLEAN pqLength(poly p, poly q, int &lp, int &lq, const int min)
    … …  
    276272
    277273
     274/// Returns:  p * q,
     275/// Destroys: if !copy then p, q
     276/// Assumes: pLength(p) >= 2 pLength(q) >=2
    278277poly _p_Mult_q(poly p, poly q, const int copy, const ring r)
    279278{

  • libpolys/polys/operations/p_Mult_q.h

    r6d9d85 ra3d94c  
    1010 *  Version: $Id$
    1111 *******************************************************************/
    12 #include "config.h"
     12
     13#ifndef P_MULT_Q_H
     14#define P_MULT_Q_H
     15
     16#include <misc/auxiliary.h>
     17
     18// #include "config.h"
    1319// #include <polys/structs.h>
    1420
    1521// Use buckets if min(pLength(p), pLength(q)) >= MIN_LENGTH_BUCKET
    1622// Not thoroughly tested what is best
     23#ifndef MIN_LENGTH_BUCKET
    1724#define MIN_LENGTH_BUCKET 10
     25#endif
    1826
    1927//  return TRUE and lp == pLength(p), lq == pLength(q),
    … …  
    2432BOOLEAN pqLength(poly p, poly q, int &lp, int &lq, const int min);
    2533
     34#endif // P_MULT_Q_H
Note: See TracChangeset for help on using the changeset viewer.