Removed compilation errors and added new implementation of ecoComplementChar

git-svn-id: https://www.grenoble.prabi.fr/svn/LECASofts/ecoPrimers/branches/eric-test@194 60f365c0-8329-0410-b2a4-ec073aeeaa1d
This commit is contained in:
2009-03-22 17:44:59 +00:00
parent 584d3c406d
commit 6726294c78
3 changed files with 5 additions and 9 deletions

View File

@ -536,6 +536,7 @@ int main(int argc, char **argv)
/*TR: Added*/ /*TR: Added*/
pairs = buildPrimerPairs(seqdb, seqdbsize, primers, &options); pairs = buildPrimerPairs(seqdb, seqdbsize, primers, &options);
// setoktaxforspecificity (&pairs); // setoktaxforspecificity (&pairs);

View File

@ -203,11 +203,6 @@ uint32_t ecoFindWord(pwordcount_t table,word_t word)
char ecoComplementChar(char base) char ecoComplementChar(char base)
{ {
switch(base){ return (base < 4)? !base & 3: 4;
case 'A': return T;
case 'C': return G;
case 'G': return C;
case 'T': return A;
}
} }

View File

@ -149,7 +149,7 @@ static int cmpamp(const void *ampf1, const void* ampf2)
} }
} }
for (i = 0; i < pampf1->length; i++, j += incr;) for (i = 0; i < pampf1->length; i++, j += incr)
{ {
cd1 = pampf1->amplifia[i]; cd1 = pampf1->amplifia[i];
if (incr == -1) if (incr == -1)
@ -157,8 +157,8 @@ static int cmpamp(const void *ampf1, const void* ampf2)
else else
cd2 = pampf2->amplifia[j]; cd2 = pampf2->amplifia[j];
if (cd1 < cd2) (chd)? return 1: return -1; if (cd1 < cd2) return chd ? 1: -1;
if (cd2 < cd1) (chd)? return -1: return 1; if (cd2 < cd1) return chd ? -1: 1;
} }
return 0; return 0;
} }