Changeset 5e069f in git

Timestamp:

Feb 25, 2015, 12:47:34 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

af797868fc826da050aa2f31b071fcaada51ed74

Parents:

69cd391441f29da7fc34ef4078408760a69a290a

Message:

cleanup (warnings, building debug stuff,...)

Location:

libpolys

Files:

• misc/Makefile.am (modified) (2 diffs)
• polys/monomials/ring.cc (modified) (1 diff)
• polys/weight0.c (modified) (4 diffs)

libpolys/misc/Makefile.am

@@ -3 +3 @@
 AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/..
 
-noinst_LTLIBRARIES = libmisc.la  libintvec.la
+noinst_LTLIBRARIES = libmisc.la
 ##### libmiscdir = $(libdir)/singular
-
-libmisc_la_LIBADD = libintvec.la
 
 ## libmisc_la_LDFLAGS    = -release ${PACKAGE_VERSION}
 
-libmisc_la_SOURCES   = int64vec.cc options.c sirandom.c
+libmisc_la_SOURCES   = int64vec.cc options.c sirandom.c intvec.cc
 
 libmisc_la_includedir = $(includedir)/singular/misc
@@ -18 +16 @@
 nodist_libmisc_la_SOURCES   = auxiliary.h
 
-libintvec_la_SOURCES = intvec.cc
-
-

libpolys/polys/monomials/ring.cc

@@ -3350 +3350 @@
 BOOLEAN rOrd_is_MixedDegree_Ordering(ring r)
 {
-  int i, k;
+  int i;
   poly p=p_One(r);
   p_SetExp(p,1,1,r);p_Setm(p,r);

libpolys/polys/weight0.c

@@ -301 +301 @@
 {
   int  n, s0, s1, s2, *xopt;
-  double  one, fx, fopt, wx;
+  double  fx, fopt, wx;
 
   n = rvar;
@@ -307 +307 @@
   fopt = *fk * (double)0.999999999999;
   wx = wPrWeight(x, n);
-  one = (double)1.0;
   loop
   {
@@ -389 +388 @@
 
 
+#if 0 /*currently unused*/
 static void wSimple(int *x, int n)
 {
@@ -463 +463 @@
     wGcd(x, n);
 }
-
+#endif
 
 void wNorm(int *degw, int *lpol, int npol, double *rel)