Changeset d52c12 in git

Timestamp:

Jun 17, 2010, 4:31:20 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

44651b7a294639985e8e521f09f763d3bb0a4abf

Parents:

19b3c75184f32c67c2f6f1898582a25004784935

Message:

more factory sysntax fixes

git-svn-id: file:///usr/local/Singular/svn/trunk@12882 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

factory

Files:

• DegreePattern.cc (modified) (3 diffs)
• DegreePattern.h (modified) (2 diffs)
• facFqFactorizeUtil.cc (modified) (7 diffs)
• facFqFactorizeUtil.h (modified) (2 diffs)

factory/DegreePattern.cc

@@ -20 +20 @@
 #include "gfops.h"
 
-inline
+
 DegreePattern::DegreePattern (const CFList& l) 
 { 
@@ -60 +60 @@
 
 
-inline int
-DegreePattern::find (const int x) const
-{
-  if (getLength() == 0) return 0;
-  for (int i= 0; i < getLength(); i++) 
-    if ((*this)[i] == x) return i + 1;
-  return 0;
-}
-
-inline void
-DegreePattern::intersect (const DegreePattern& degPat)
+void DegreePattern::intersect (const DegreePattern& degPat)
 {
   if (degPat.getLength() < getLength()) 
@@ -107 +97 @@
 }
    
-inline void
-DegreePattern::refine ()
+void DegreePattern::refine ()
 {
   if (getLength() <= 1)

factory/DegreePattern.h

@@ -159 +159 @@
   /// @return @a find returns the index + 1 of @a x, if @a x is an element of 
   ///         the degree pattern, 0 otherwise
-  inline int find (const int x ///< [in] some int
-           ) const;
+  int find (const int x ///< [in] some int
+           ) const
+  {
+    if (getLength() == 0) return 0;
+    for (int i= 0; i < getLength(); i++)
+      if ((*this)[i] == x) return i + 1;
+    return 0;
+  };
   
   /// intersect two degree patterns 
-  inline void intersect (const DegreePattern& degPat ///< [in] some degree pattern
+  void intersect (const DegreePattern& degPat ///< [in] some degree pattern
                  );
   /// Refine a degree pattern. Assumes that (*this)[0]:= @a d is the degree
@@ -169 +175 @@
   /// some entry @a b such that @a a+b= d. Elements which do not satisfy this 
   /// relation are removed.
-  inline void refine ();
+  void refine ();
 };
 

factory/facFqFactorizeUtil.cc

@@ -17 +17 @@
 #include "canonicalform.h"
 #include "cf_map.h"
-
-static inline 
-void decompressAppend (CFList& factors1, const CFList& factors2, const CFMap& N) 
-{
-  for (CFListIterator i= factors1; i.hasItem(); i++) 
-    i.getItem()= N (i.getItem());
-  for (CFListIterator i= factors2; i.hasItem(); i++)
-    factors1.append (N (i.getItem()));
-  return; 
-}
 
 static inline 
@@ -53 +43 @@
 }
 
-static inline 
+
 void swap (CFList& factors, const int swapLevel1, const int swapLevel2, const
            Variable& x) 
@@ -76 +66 @@
 }
 
-static inline 
 void appendSwapDecompress (CFList& factors1, const CFList& factors2, 
                              const CFMap& N, const int swapLevel, const
@@ -95 +84 @@
 }
 
-static inline 
 void appendSwapDecompress (CFList& factors1, const CFList& factors2, 
                              const CFMap& N, const int swapLevel1, 
@@ -127 +115 @@
 }
 
-static inline
 int* liftingBounds (const CanonicalForm& A, const int& bivarLiftBound) 
 {
@@ -141 +128 @@
 }
 
-static inline
-CanonicalForm
-shift2Zero (const CanonicalForm& F, CFList& Feval, const CFList& evaluation)
+CanonicalForm shift2Zero (const CanonicalForm& F, CFList& Feval, const CFList& evaluation)
 {
   CanonicalForm A= F;
@@ -160 +145 @@
 }
 
-static inline
 CanonicalForm reverseShift (const CanonicalForm& F, const CFList& evaluation)
 {

factory/facFqFactorizeUtil.h

@@ -23 +23 @@
 /// append @a factors2 to @a factors1 and decompress
 ///
+static inline 
 void decompressAppend (CFList& factors1,       ///< [in,out] a list of polys,
                                                ///< returns @a factors2 appended
@@ -29 +30 @@
                        const CFList& factors2, ///< [in] a list of polys
                        const CFMap& N          ///< [in] a map
-                      );
+                      )
+{
+  for (CFListIterator i= factors1; i.hasItem(); i++) 
+    i.getItem()= N (i.getItem());
+  for (CFListIterator i= factors2; i.hasItem(); i++)
+    factors1.append (N (i.getItem()));
+}
+
 
 /// swap elements in @a factors2 and append them to @a factors1