Changeset b849856 in git for libpolys


Ignore:
Timestamp:
Dec 18, 2018, 4:17:32 PM (5 years ago)
Author:
Karim Abou Zeid <karim23697@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
921f32e8096a04479ffe856dbc19d6e5553acbf6
Parents:
c7231560b85e2e1683beb9629db0560ee8ca425518a3dfc149d105d7058f8c06ea4ad50eb59f0c94
Message:
Merge branch 'spielwiese' into christmas-release
Location:
libpolys
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • libpolys/coeffs/coeffs.h

    rc723156 rb849856  
    1111
    1212#include "misc/auxiliary.h"
    13 #ifdef HAVE_OMALLOC
    1413#include "omalloc/omalloc.h"
    15 #else
    16 #include "xalloc/omalloc.h"
    17 #endif
    1814
    1915#include "misc/sirandom.h"

  • libpolys/coeffs/shortfl.h

    rc723156 rb849856  
    88*/
    99#include "misc/auxiliary.h"
    10 #ifdef HAVE_OMALLOC
    1110#include "omalloc/omalloc.h"
    12 #else
    13 #include "xalloc/omalloc.h"
    14 #endif
    1511
    1612#if SIZEOF_DOUBLE == SIZEOF_LONG

  • libpolys/misc/int64vec.h

    rc723156 rb849856  
    1111
    1212#include "misc/auxiliary.h"
     13#include "omalloc/omalloc.h"
    1314#ifdef HAVE_OMALLOC
    14 #include "omalloc/omalloc.h"
    1515#include "omalloc/omallocClass.h"
    16 #else
    17 #include "xalloc/omalloc.h"
    1816#endif
    1917

  • libpolys/misc/intvec.cc

    rc723156 rb849856  
    1212#include "misc/intvec.h"
    1313#include "misc/options.h"
    14 #ifdef HAVE_OMALLOC
    1514#include "omalloc/omalloc.h"
    16 #else
    17 #include "xalloc/omalloc.h"
    18 #endif
    19 
    2015
    2116#pragma GCC push_options

  • libpolys/misc/intvec.h

    rc723156 rb849856  
    99#include <string.h>
    1010#include "misc/auxiliary.h"
     11#include "omalloc/omalloc.h"
    1112#ifdef HAVE_OMALLOC
    12 #include "omalloc/omalloc.h"
    1313#include "omalloc/omallocClass.h"
    14 #else
    15 #include "xalloc/omalloc.h"
    1614#endif
    1715

  • libpolys/polys/mod_raw.cc

    rc723156 rb849856  
    1919#include <unistd.h>
    2020
    21 
    22 
    23 
    24 
    2521#include "misc/auxiliary.h"
    26 
    2722#include "reporter/reporter.h"
    28 
    2923#include "resources/feResource.h"
    30 
    31 #ifdef HAVE_OMALLOC
    3224#include "omalloc/omalloc.h"
    33 #else
    34 #include "xalloc/omalloc.h"
    35 #endif
    36 
    3725#include "mod_raw.h"
    3826

  • libpolys/polys/shiftop.cc

    r18a3df rb849856  
    368368  p_GetExpV(m,e,ri);
    369369
     370  if (p_mLastVblock(m, e, ri) + sh > ri->N/lV)
     371  {
     372    Werror("letterplace degree bound is %d, but at least %d is needed for this shift", ri->N/lV, p_mLastVblock(m, e, ri) + sh);
     373  }
    370374  for (int i = ri->N - sh*lV; i > 0; i--)
    371375  {
    … …  
    506510  PrintLn(); WriteLPExpV(m2ExpV, ri);
    507511#endif
    508   if (m1Length + m2Length > ri->N)
    509   {
    510     WarnS("letterplace degree bound too low for this multiplication");
    511   }
    512   for (int i = 1 + m1Length; i < 1 + m1Length + m2Length; ++i)
     512  int last = m1Length + m2Length;
     513  if (last > ri->N)
     514  {
     515    Werror("letterplace degree bound is %d, but at least %d is needed for this multiplication", ri->N/ri->isLPring, last/ri->isLPring);
     516    last = ri->N;
     517  }
     518  for (int i = 1 + m1Length; i < 1 + last; ++i)
    513519  {
    514520    assume(m2ExpV[i - m1Length] <= 1);
    … …  
    531537  PrintLn(); WriteLPExpV(m2ExpV, ri);
    532538#endif
    533   if (m1Length + m2Length > ri->N)
    534   {
    535     WarnS("letterplace degree bound too low for this multiplication");
     539  int last = m1Length + m2Length;
     540  if (last > ri->N)
     541  {
     542    Werror("letterplace degree bound is %d, but at least %d is needed for this multiplication", ri->N/ri->isLPring, last/ri->isLPring);
     543    last = ri->N;
    536544  }
    537545
    538546  // shift m1 by m2Length
    539   for (int i = m2Length + m1Length; i >= 1 + m2Length; --i)
     547  for (int i = last; i >= 1 + m2Length; --i)
    540548  {
    541549    m1ExpV[i] = m1ExpV[i - m2Length];

  • libpolys/polys/weight0.c

    rc723156 rb849856  
    88
    99#include "misc/auxiliary.h"
    10 
    11 #ifdef HAVE_OMALLOC
    1210#include "omalloc/omalloc.h"
    13 #else
    14 #include "xalloc/omalloc.h"
    15 #endif
    1611
    1712#include <math.h>

  • libpolys/reporter/reporter.cc

    rc723156 rb849856  
    1313#include "resources/feFopen.h"
    1414//#include "options.h"
    15 #ifdef HAVE_OMALLOC
    1615#include "omalloc/omalloc.h"
    17 #else
    18 #include "xalloc/omalloc.h"
    19 #endif
    2016
    2117#include <stdlib.h>

  • libpolys/reporter/s_buff.cc

    rc723156 rb849856  
    1111
    1212#include "misc/auxiliary.h"
    13 #ifdef HAVE_OMALLOC
    1413#include "omalloc/omalloc.h"
    15 #else
    16 #include "xalloc/omalloc.h"
    17 #endif
    1814
    1915#include "reporter/s_buff.h"
Note: See TracChangeset for help on using the changeset viewer.