Changeset 3fd99f1 in git

Timestamp:

May 19, 2014, 5:23:57 PM (9 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

d0bf7c4ac3e3b6b83feb550488644eae0d452f83

Parents:

4b765613576840413ceed765d6e9304d06b1ba3f

git-author:

Martin Lee <martinlee84@web.de>2014-05-19 17:23:57+02:00

git-committer:

Martin Lee <martinlee84@web.de>2014-05-21 15:06:57+02:00

Message:

chg: more normalization

Location:

factory

Files:

• cfCharSets.cc (modified) (2 diffs)
• cfCharSetsUtil.cc (modified) (2 diffs)

factory/cfCharSets.cc

@@ -518 +518 @@
     }
     else
-      qs= CFFList (CFFactor (i.getItem(), 1));
+      qs= CFFList (CFFactor (normalize (i.getItem()), 1));
 
     if ((qs.length() >= 2 ) || (qs.getFirst().exp() > 1))
@@ -556 +556 @@
   }
   for (CFFListIterator k= qs; k.hasItem(); k++)
-    ts.append (k.getItem().factor());
+    ts.append (normalize (k.getItem().factor()));
   return ts;
 }

factory/cfCharSetsUtil.cc

@@ -899 +899 @@
     else
       cF= 0;
+    F= normalize (F);
 
     return;
@@ -1005 +1006 @@
     if (cc.level() > 0 )
     {
-      output.append (elem / cc);
-      StoredFactors.FS1 = Union (CFList (cc), StoredFactors.FS1);
+      output.append (normalize (elem / cc));
+      StoredFactors.FS1 = Union (CFList (normalize (cc)), StoredFactors.FS1);
     }
     else
-      output.append(elem);
+      output.append(normalize (elem));
   }
   return output;