Changeset e63e239 in git

Timestamp:

Jan 19, 2002, 6:11:43 PM (22 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

b9020c376e237c88f9dffd14d84ef432f4734b95

Parents:

33293b6db9d4cea6e4dd38872ad570795569fc75

Message:

* extended fast_map function by HAVE_DEST_R


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

Location:

Singular

Files:

• fast_maps.cc (modified) (5 diffs)
• ring.cc (modified) (2 diffs)
• ring.h (modified) (2 diffs)

Singular/fast_maps.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 02/01
- *  Version: $Id: fast_maps.cc,v 1.15 2002-01-19 16:14:46 Singular Exp $
+ *  Version: $Id: fast_maps.cc,v 1.16 2002-01-19 17:11:42 obachman Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -18 +18 @@
 #include "fast_maps.h"
 
+// define if you want to use special dest_ring
+#define HAVE_DEST_R 1
+// define if you want to use special src_ring
+#define HAVE_SRC_R 0
+// define if you want to use optimization step
+#define HAVE_MAP_OPTIMIZATION 0
+
+
+
+/*******************************************************************************
+**
+*F  maMaxExp  . . . . . . . . . . . .  returns maximal exponent of result of map
+*/
+// return maximal monomial if max_map_monomials are substituted into pi_m
+static poly maGetMaxExpP(poly* max_map_monomials, 
+                         int n_max_map_monomials, ring map_r, 
+                         poly pi_m, ring pi_r)
+{
+  int n = min(pi_r->N, n_max_map_monomials);
+  int i, j;
+  Exponent_t e_i, e_j;
+  poly m_i, map_j = p_Init(map_r);
+  
+  for (i=1; i <= n; i++)
+  {
+    e_i = p_GetExp(pi_m, i, pi_r);
+    m_i = max_map_monomials[i-1];
+    if (e_i > 0 && m_i != NULL && ! p_IsConstantComp(m_i, map_r))
+    {
+      for (j = 1; j<= map_r->N; j++)
+      {
+        e_j = p_GetExp(m_i, j, map_r);
+        if (e_j > 0)
+        {
+          p_AddExp(map_j, j, e_j*e_i, map_r);
+        }
+      }
+    }
+  }
+  return map_j;
+}
+
+// returns maximal exponent if map_id is applied to pi_id
+static Exponent_t maGetMaxExp(ideal map_id, ring map_r, ideal pi_id, ring pi_r)
+{
+  Exponent_t max=0;
+  poly* max_map_monomials = (poly*) omAlloc(IDELEMS(map_id)*sizeof(poly));
+  poly max_pi_i, max_map_i;
+  
+  int i, j;
+  for (i=0; i<IDELEMS(map_id); i++)
+  {
+    max_map_monomials[i] = p_GetMaxExpP(map_id->m[i], map_r);
+  }
+  
+  for (i=0; i<IDELEMS(pi_id); i++)
+  {
+    max_pi_i = p_GetMaxExpP(pi_id->m[i], pi_r);
+    max_map_i = maGetMaxExpP(max_map_monomials, IDELEMS(map_id), map_r, 
+                              max_pi_i, pi_r);
+    Exponent_t temp = p_GetMaxExp(max_map_i, map_r);
+    if (temp > max){
+      max=temp;
+    }
+
+    p_LmFree(max_pi_i, pi_r);
+    p_LmFree(max_map_i, map_r);
+  }
+  return max;
+}
+
+
 #if 0
 // paste into extra.cc
@@ -52 +124 @@
 
 #endif
+
 /*******************************************************************************
 **
@@ -222 +295 @@
 }
 
+
 void maMap_CreateRings(ideal map_id, ring map_r, 
                        ideal image_id, ring image_r, 
                        ring &src_r, ring &dest_r)
 {
+#if HAVE_SRC_R > 0
+#else
   src_r = map_r;
+#endif
+
+#if HAVE_DEST_R > 0
+  Exponent_t maxExp = maGetMaxExp(map_id, map_r, image_id, map_r);
+  dest_r = rModifyRing_Simple(image_r, TRUE, TRUE, maxExp);
+#else
   dest_r = image_r;
-}
-
+#endif
+}
+
+void maMap_KillRings(ring map_r, ring image_r, ring src_r, ring dest_r)
+{
+  if (map_r != src_r)
+    rKillModified_Wp_Ring(src_r);
+  if (image_r != dest_r)
+    rKillModifiedRing_Simple(dest_r);
+}
+    
 ideal maIdeal_2_Ideal(maideal m_id, ring dest_r)
 {
@@ -247 +338 @@
 {
   ring src_r, dest_r;
+  ideal dest_id, res_id;
+
+  // construct rings we work in: 
+  // src_r: Wp with Weights set to length of poly in image_id
+  // dest_r: Simple ring without degree ordering and short exponents
   maMap_CreateRings(map_id, map_r, image_id, image_r, src_r, dest_r);
   
+  // construct dest_id
+  if (dest_r != image_r)
+    dest_id = idrShallowCopyR(image_id, image_r, dest_r);
+  else
+    dest_id = image_id;
+
+  // construct mpoly and mideal
   mapoly mp;
   maideal mideal;
   maMap_CreatePolyIdeal(map_id, map_r, src_r, dest_r, mp, mideal);
-  maPoly_Eval(mp, src_r, image_id, dest_r);
-
-  return maIdeal_2_Ideal(mideal, dest_r);
-}
+  
+  // do the optimization step
+#if HAVE_MAP_OPTIMIZE > 0
+  maPoly_Optimize(mp, src_r);
+#endif
+
+  // do the actual evaluation
+  maPoly_Eval(mp, src_r, dest_id, dest_r);
+
+  // collect the results back into an ideal
+  ideal res_dest_id = maIdeal_2_Ideal(mideal, dest_r);
+
+  // convert result back to image_r
+  ideal res_image_id;
+  if (dest_r != image_r)
+  {
+    res_image_id = idrShallowCopyR(res_dest_id, dest_r, image_r);
+    id_ShallowDelete(&res_dest_id, dest_r);
+  }
+  else
+    res_image_id = res_dest_id;
+  
+  // clean-up the rings
+  maMap_KillRings(map_r, image_r, src_r, dest_r);
+
+  return res_image_id;
+}
+
 
 #if 0

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.175 2002-01-19 14:48:18 obachman Exp $ */
+/* $Id: ring.cc,v 1.176 2002-01-19 17:11:42 obachman Exp $ */
 
 /*
@@ -2657 +2657 @@
 }
 
+// construct lp ring
+ring rModifyRing_Simple(ring r, BOOLEAN ommit_degree, BOOLEAN ommit_comp, int exp_limit)
+{
+  if (!rHasSimpleOrder(r))
+    WarnS("Hannes: you still need to implement this");
+  return rModifyRing(r, ommit_degree, ommit_comp, exp_limit);
+}
+
+void rKillModifiedRing_Simple(ring r)
+{
+  rKillModifiedRing(r);
+}
+
   
 void rKillModifiedRing(ring r)

Singular/ring.h

@@ -7 +7 @@
 * ABSTRACT - the interpreter related ring operations
 */
-/* $Id: ring.h,v 1.69 2002-01-19 14:48:19 obachman Exp $ */
+/* $Id: ring.h,v 1.70 2002-01-19 17:11:43 obachman Exp $ */
 
 /* includes */
@@ -268 +268 @@
 void rKillModified_Wp_Ring(ring r);
 
+ring rModifyRing_Simple(ring r, BOOLEAN omit_degree, BOOLEAN omit_comp, unsigned long exp_limit);
+void rKillModifiedRing_Simple(ring r);
+
 void rDebugPrint(ring r);
 void pDebugPrint(poly p);