1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172
|
*** protpars.c~ Tue Apr 13 14:41:34 MET DST 1999
- --- protpars.c Tue Apr 13 16:09:57 MET DST 1999
***************
*** 446,461 ****
outgropt = !outgropt;
if (outgropt) {
done1 = true;
! do {
! printf("Type number of the outgroup:\n");
! scanf("%ld%*[^\n]", &outgrno);
! getchar();
! done1 = (outgrno >= 1 && outgrno <= spp);
! if (!done1) {
! printf("BAD OUTGROUP NUMBER: %4ld\n", outgrno);
! printf(" Must be in range 1 -%2ld\n", spp);
! }
! } while (done1 != true);
} else outgrno = 1;
break;
- --- 446,467 ----
outgropt = !outgropt;
if (outgropt) {
done1 = true;
! {
! int cpt=10;
! do {
! printf("Type number of the outgroup:\n");
! scanf("%ld%*[^\n]", &outgrno);
! getchar();
! done1 = (outgrno >= 1 && outgrno <= spp);
! if (!done1) {
! printf("BAD OUTGROUP NUMBER: %4ld\n", outgrno);
! printf(" Must be in range 1 -%2ld\n", spp);
! }
! cpt--;
! if (cpt == 0) exit(-1);
!
! } while (done1 != true);
! }
} else outgrno = 1;
break;
*** neighbor.c~ Wed Jul 9 01:48:38 MET DST 1997
- --- neighbor.c Tue Apr 13 16:19:46 MET DST 1999
***************
*** 247,262 ****
outgropt = !outgropt;
if (outgropt) {
done1 = true;
! do {
! printf("Type number of the outgroup:\n");
! scanf("%ld%*[^\n]", &outgrno);
! getchar();
! done1 = (outgrno >= 1 && outgrno <= numsp);
! if (!done1) {
! printf("BAD OUTGROUP NUMBER: %4ld\n", outgrno);
! printf(" Must be in range 1 -%2ld\n", numsp);
! }
! } while (done1 != true);
}
else
outgrno = 1;
- --- 247,267 ----
outgropt = !outgropt;
if (outgropt) {
done1 = true;
! {
! int cpt=10;
! do {
! printf("Type number of the outgroup:\n");
! scanf("%ld%*[^\n]", &outgrno);
! getchar();
! done1 = (outgrno >= 1 && outgrno <= numsp);
! if (!done1) {
! printf("BAD OUTGROUP NUMBER: %4ld\n", outgrno);
! printf(" Must be in range 1 -%2ld\n", numsp);
! }
! cpt--;
! if (cpt == 0) exit(-1);
! } while (done1 != true);
! }
}
else
outgrno = 1;
*** fitch.c~ Fri Jan 29 10:22:28 MET 1999
- --- fitch.c Tue Apr 13 16:19:02 MET DST 1999
***************
*** 309,325 ****
outgropt = !outgropt;
if (outgropt) {
done1 = true;
! do {
! printf("Type number of the outgroup:\n");
! scanf("%hd%*[^\n]", &outgrno);
! getchar();
! done1 = (outgrno >= 1 && outgrno <= numsp);
! if (!done1) {
! printf("BAD OUTGROUP NUMBER: %4hd\n", outgrno);
! printf(" Must be in range 1 -%2hd\n", numsp);
! }
! } while (done1 != true);
! }
break;
case 'P':
- --- 309,330 ----
outgropt = !outgropt;
if (outgropt) {
done1 = true;
! {
! int cpt=10;
! do {
! printf("Type number of the outgroup:\n");
! scanf("%hd%*[^\n]", &outgrno);
! getchar();
! done1 = (outgrno >= 1 && outgrno <= numsp);
! if (!done1) {
! printf("BAD OUTGROUP NUMBER: %4hd\n", outgrno);
! printf(" Must be in range 1 -%2hd\n", numsp);
! }
! cpt--;
! if (cpt == 0) exit(-1);
! } while (done1 != true);
! }
! }
break;
case 'P':
*** dnapars.c~ Tue Apr 13 14:41:34 MET DST 1999
- --- dnapars.c Tue Apr 13 16:18:12 MET DST 1999
***************
*** 298,313 ****
outgropt = !outgropt;
if (outgropt) {
done1 = true;
! do {
! printf("Type number of the outgroup:\n");
! scanf("%hd%*[^\n]", &outgrno);
getchar();
! done1 = (outgrno >= 1 && outgrno <= spp);
! if (!done1) {
! printf("BAD OUTGROUP NUMBER: %4hd\n", outgrno);
! printf(" Must be in range 1 -%2hd\n", spp);
! }
! } while (done1 != true);
}
break;
- --- 298,318 ----
outgropt = !outgropt;
if (outgropt) {
done1 = true;
! {
! int cpt=10;
! do {
! printf("Type number of the outgroup:\n");
! scanf("%hd%*[^\n]", &outgrno);
getchar();
! done1 = (outgrno >= 1 && outgrno <= spp);
! if (!done1) {
! printf("BAD OUTGROUP NUMBER: %4hd\n", outgrno);
! printf(" Must be in range 1 -%2hd\n", spp);
! }
! cpt--;
! if (cpt == 0) exit(-1);
! } while (done1 != true);
! }
}
break;
|