Changeset 94a967 in git for factory/canonicalform.cc

Timestamp:

Jun 19, 2008, 5:58:18 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

6f49c34b8c235506ef7d34be2d0cd7b9ed4f708d

Parents:

4f48983e2d88ea0745d1992935e0f1c7b97642d0

Message:

*hannes: format


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

File:

• factory/canonicalform.cc (modified) (4 diffs)

factory/canonicalform.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: canonicalform.cc,v 1.41 2007-12-04 15:24:53 Singular Exp $ */
+/* $Id: canonicalform.cc,v 1.42 2008-06-19 15:57:37 Singular Exp $ */
 
 #include <config.h>
@@ -252 +252 @@
             else
                 return *this;
-        else  if ( CFFactory::gettype() == PrimePowerDomain ) {
+        else  if ( CFFactory::gettype() == PrimePowerDomain )
+        {
             ASSERT( value->levelcoeff() == PrimePowerDomain || value->levelcoeff() == IntegerDomain, "no proper map defined" );
             if ( value->levelcoeff() == PrimePowerDomain )
@@ -259 +260 @@
                 return CFFactory::basic( getmpi( value ) );
         }
-        else {
+        else
+        {
             int val;
             if ( value->levelcoeff() == IntegerDomain )
@@ -274 +276 @@
                 return CanonicalForm( int2imm_p( val ) );
         }
-    else {
+    else
+    {
         Variable x = value->variable();
         CanonicalForm result;
         for ( CFIterator i = *this; i.hasTerms(); i++ )
-            result += power( x, i.exp() ) * i.coeff().mapinto();
+            result += (power( x, i.exp() ) * i.coeff().mapinto());
         return result;
     }