Changeset 1628d3b in git


Ignore:
Timestamp:
Feb 16, 2011, 3:52:02 PM (13 years ago)
Author:
Mohamed Barakat <mohamed.barakat@…>
Branches:
(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')
Children:
af8c79e316e617d102755c9e4c24252fd4a518af
Parents:
ea11dcde9c525e14e42ef49423d3913e03d714de
git-author:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-02-16 15:52:02+01:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:59:29+01:00
Message:
- added intvec to misc
- created libmisc
Location:
libpolys/misc
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • libpolys/misc/Makefile.am

    rea11dc r1628d3b  
    1 include_HEADERS=auxiliary.h mylimits.h options.h
     1lib_LIBRARIES=libmisc.a libmisc_g.a
    22
     3AM_CFLAGS       = -O3 -w -fomit-frame-pointer ${PIPE}
     4CXXTEMPLFLAGS   = -fno-implicit-templates --no-exceptions
     5AM_CXXFLAGS     = -O3 -w -fomit-frame-pointer --no-rtti ${PIPE} ${CXXTEMPLFLAGS}
     6INCLUDES        = -I${top_srcdir}/.. -I${top_srcdir}/../.. -I${top_builddir}/..
     7AM_CPPFLAGS     = -DNDEBUG -DOM_NDEBUG -DHAVE_CONFIG_H
     8
     9SOURCES = intvec.cc
     10
     11libmisc_a_SOURCES = $(SOURCES)
     12
     13libmisc_a_includedir=$(includedir)/libpolys/misc
     14
     15libmisc_a_include_HEADERS = auxiliary.h mylimits.h options.h intvec.h
     16
     17libmisc_g_a_SOURCES = $(SOURCES)
     18
     19libmisc_g_a_CXXFLAGS = -g -Wextra -Wall -pedantic -fdiagnostics-show-option -Wno-long-long

  • libpolys/misc/auxiliary.h

    rea11dc r1628d3b  
    8888#define loop for(;;)
    8989
     90#if defined(__cplusplus)
    9091static inline int si_max(const int a, const int b)  { return (a>b) ? a : b; }
     92static inline int si_min(const int a, const int b)  { return (a<b) ? a : b; }
     93static inline long si_max(const long a, const long b)  { return (a>b) ? a : b; }
     94static inline unsigned long si_max(const unsigned long a, const unsigned long b)  { return (a>b) ? a : b; }
     95static inline long si_min(const long a, const long b)  { return (a<b) ? a : b; }
     96static inline unsigned long si_min(const unsigned long a, const unsigned long b)  { return (a<b) ? a : b; }
     97#else
     98#define si_max(A,B) ((A) > (B) ? (A) : (B))
     99#define si_min(A,B) ((A) < (B) ? (A) : (B))
     100#endif
     101
    91102
    92103// ---------------- end of Singular standard types etc.

  • libpolys/misc/configure.ac

    rea11dc r1628d3b  
    1313AC_PROG_LN_S
    1414AC_PROG_INSTALL
     15AC_PROG_RANLIB
    1516
    1617# Checks for libraries.

  • libpolys/misc/intvec.cc

    rea11dc r1628d3b  
    88#ifndef INTVEC_CC
    99#define INTVEC_CC
    10 #include <kernel/mod2.h>
    11 #include <kernel/febase.h>
    12 #include <kernel/options.h>
    13 #include <kernel/intvec.h>
     10// #include <resources/feFopen.h>
     11#include <misc/intvec.h>
    1412#include <omalloc/omalloc.h>
    1513
    … …  
    654652  intvec *res=new intvec(c);
    655653
    656   if (TEST_OPT_PROT)
    657     Warn(" %d linear independent solutions\n",r);
     654  //if (TEST_OPT_PROT)
     655  //  Warn(" %d linear independent solutions\n",r);
    658656  for (i=r;i>1;i--)
    659657  {
Note: See TracChangeset for help on using the changeset viewer.