Changeset 6269 for branches/clusters/SL/FAST_ALIGNER/ClustalV.cxx

Timestamp:

23/11/09 08:54:41 (3 years ago)

Author:

westram

Message:

• merged 6262-6267

Files:

• branches/clusters/SL/FAST_ALIGNER/ClustalV.cxx (modified) (7 diffs)

branches/clusters/SL/FAST_ALIGNER/ClustalV.cxx

@@ -384 +384 @@
 
 #if (defined(DISPLAY_DIFF) || defined(MATRIX_DUMP))
-static GB_ERROR p_decode(const unsigned char *naseq, unsigned char *seq, int l) {
+static void p_decode(const unsigned char *naseq, unsigned char *seq, int l) {
     int len = strlen(amino_acid_order);
 
@@ -392 +392 @@
         seq[i] = amino_acid_order[naseq[i]];
     }
-
-    return 0;
-}
-
-static GB_ERROR n_decode(const unsigned char *naseq, unsigned char *seq, int l) {
+}
+
+static void n_decode(const unsigned char *naseq, unsigned char *seq, int l) {
     int len = strlen(nucleic_acid_order);
 
@@ -404 +402 @@
         seq[i] = nucleic_acid_order[naseq[i]];
     }
-
-    return 0;
 }
 #endif
@@ -1106 +1102 @@
 }
 
-static GB_ERROR p_encode(const unsigned char *seq, unsigned char *naseq, int l) /* code seq as ints .. use -2 for gap */ {
+static void p_encode(const unsigned char *seq, unsigned char *naseq, int l) /* code seq as ints .. use -2 for gap */ {
     bool warned = false;
 
@@ -1130 +1126 @@
         naseq[i] = c;
     }
-
-    return 0;
-}
-
-static GB_ERROR n_encode(const unsigned char *seq,unsigned char *naseq,int l)
+}
+
+static void n_encode(const unsigned char *seq,unsigned char *naseq,int l)
 {                                       /* code seq as ints .. use -2 for gap */
     int i;
@@ -1156 +1150 @@
         naseq[i] = c;
     }
-
-    return 0;
 }
 
@@ -1212 +1204 @@
 
         {
-            GB_ERROR (*encode)(const unsigned char*,unsigned char*,int) = dnaflag ? n_encode : p_encode;
-
-            error = encode((const unsigned char*)(seq1-1), seq_array[1], length1);
-            if (!error) {
-                seqlen_array[1] = length1;
-                error = encode((const unsigned char*)(seq2-1), seq_array[2], length2);
-                if (!error) {
-                    seqlen_array[2] = length2;
-
-                    do_align(/* gap_open,*/ score, max(length1,length2));
-                    int alignedLength = add_ggaps(max_seq_length);
-
-                    *resultPtr1   = result[1]+1;
-                    *resultPtr2   = result[2]+1;
-                    *resLengthPtr = alignedLength;
-                }
-            }
+            void (*encode)(const unsigned char*,unsigned char*,int) = dnaflag ? n_encode : p_encode;
+
+            encode((const unsigned char*)(seq1-1), seq_array[1], length1);
+            seqlen_array[1] = length1;
+            encode((const unsigned char*)(seq2-1), seq_array[2], length2);
+            seqlen_array[2] = length2;
+
+            do_align(/* gap_open,*/ score, max(length1,length2));
+            int alignedLength = add_ggaps(max_seq_length);
+
+            *resultPtr1   = result[1]+1;
+            *resultPtr2   = result[2]+1;
+            *resLengthPtr = alignedLength;
         }
     }