Changeset 70161e in git

Timestamp:

Jul 16, 1996, 2:26:05 PM (27 years ago)

Author:

Rüdiger Stobbe <stobbe@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

1251952559942e380e666f13188d81cd17e90569

Parents:

9f2b6f23a8e1f2de750bc3241e6e692d3f57c0d1

Message:

"New functions prod, crossprod ans sum for CFArrays, since these functions
are no longer contained in the template specification of Array.
"


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

Location:

factory

Files:

• fac_util.cc (modified) (2 diffs)
• fac_util.h (modified) (3 diffs)

factory/fac_util.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fac_util.cc,v 1.2 1996-07-08 08:22:02 stobbe Exp $
+// $Id: fac_util.cc,v 1.3 1996-07-16 12:26:05 stobbe Exp $
 
 /*
 $Log: not supported by cvs2svn $
+Revision 1.2  1996/07/08 08:22:02  stobbe
+"New organization of the factorization stuff. Some functions moved from
+fac_diophand.cc which no longer exists.
+"
+
 Revision 1.1  1996/06/27 11:34:24  stobbe
 "New function dviremainder.
@@ -213 +218 @@
 }
 
+CanonicalForm
+sum ( const CFArray & a, int f, int l )
+{
+    if ( f < a.min() ) f = a.min();
+    if ( l > a.max() ) l = a.max();
+    CanonicalForm s = 0;
+    for ( int i = f; i <= l; i++ )
+        s += a[i];
+    return s;
+}
+
+CanonicalForm
+prod ( const CFArray & a, int f, int l )
+{
+    if ( f < a.min() ) f = a.min();
+    if ( l > a.max() ) l = a.max();
+    CanonicalForm p = 1;
+    for ( int i = f; i <= l; i++ )
+        p *= a[i];
+    return p;
+}
+
+CanonicalForm
+sum ( const CFArray & a )
+{
+    return sum( a, a.min(), a.max() );
+}
+
+CanonicalForm
+prod ( const CFArray & a )
+{
+    return prod( a, a.min(), a.max() );
+}
+
+CanonicalForm
+crossprod ( const CFArray & a, const CFArray & b )
+{
+    if ( a.size() != b.size() ) {
+        cerr << "warning: array size mismatch." << endl;
+        return 0;
+    }
+    CanonicalForm s = 0;
+    int fa = a.min();
+    int fb = b.min();
+    int n = a.max();
+    for ( ; fa <= n; fa++, fb++ )
+        s += a[fa] * b[fb];
+    return s;
+}

factory/fac_util.h

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fac_util.h,v 1.2 1996-07-08 08:22:02 stobbe Exp $
+// $Id: fac_util.h,v 1.3 1996-07-16 12:26:05 stobbe Exp $
 
 #ifndef INCL_FAC_UTIL_H
@@ -7 +7 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.2  1996/07/08 08:22:02  stobbe
+"New organization of the factorization stuff. Some functions moved from
+fac_diophand.cc which no longer exists.
+"
+
 Revision 1.1  1996/06/27 11:34:25  stobbe
 "New function dviremainder.
@@ -52 +57 @@
 bool Hensel ( const CanonicalForm & U, CFArray & G, const CFArray & lcG, const Evaluation & A, const modpk & bound, const Variable & x );
 
+/* some special array functions */
+
+CanonicalForm sum ( const CFArray & a, int f, int l );
+
+CanonicalForm prod ( const CFArray & a, int f, int l );
+
+CanonicalForm sum ( const CFArray & a );
+
+CanonicalForm prod ( const CFArray & a );
+
+CanonicalForm crossprod ( const CFArray & a, const CFArray & b );
+
 /*ENDPUBLIC*/