Changeset aba96c3 in git

Timestamp:

Jun 25, 2010, 10:07:54 AM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

e3b3168b5d15b9433ea6b864e17b0d261c58c36d

Parents:

634126245ebc7381c3357f3803b1945df8c25b46

Message:

better bit handling

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

File:

• Singular/misc_ip.cc (modified) (5 diffs)

Singular/misc_ip.cc

@@ -1 +1 @@
 /*****************************************************************************\
- * Computer Algebra System SINGULAR    
+ * Computer Algebra System SINGULAR
 \*****************************************************************************/
 /** @file misc.cc
@@ -30 +30 @@
 number approximateSqrt(const number n)
 {
-  if (nlIsZero(n)) { number zero = nlInit(0, NULL); return zero; }
+  if (nlIsZero(n)) { return nlInit(0, NULL); }
   number temp1; number temp2;
   number one = nlInit(1, NULL);
@@ -42 +42 @@
     temp1 = nlIntDiv(m, two);
     temp2 = nlIntDiv(nHalf, m);
+    nlDelete(&mOld, NULL);
     mOld = m;
     m = nlAdd(temp1, temp2);
@@ -62 +63 @@
   nlDelete(&m, NULL);
   nlDelete(&one, NULL);
-  m = temp1;
-  return m;
+  return temp1;
 }
 
@@ -124 +124 @@
   int offset = i % 32;
   unsigned int v = 1 << offset;
-  if (value && ((ii[index] & v) != 0)) return;
-  if ((!value) && ((ii[index] & v) == 0)) return;
-  if (value && ((ii[index] & v) == 0)) { ii[index] += v; return; }
-  if ((!value) && ((ii[index] & v) != 0)) { ii[index] -= v; return; }
+  if (value) ii[index] |= v;
+  else       ii[index] &= (~v);
 }