equal
deleted
inserted
replaced
89 */ |
89 */ |
90 qreal variance = 0.; |
90 qreal variance = 0.; |
91 if (r1.unit == "msec") { |
91 if (r1.unit == "msec") { |
92 variance = 0.1; |
92 variance = 0.1; |
93 } |
93 } |
94 else if (r1.unit == "instr. loads") { |
94 else if (r1.unit == "instruction reads") { |
95 variance = 0.001; |
95 variance = 0.001; |
96 } |
96 } |
97 else if (r1.unit == "ticks") { |
97 else if (r1.unit == "ticks") { |
98 variance = 0.001; |
98 variance = 0.001; |
99 } |
99 } |
537 } |
537 } |
538 // Text result |
538 // Text result |
539 |
539 |
540 /* This code avoids using a QRegExp because QRegExp might be broken. */ |
540 /* This code avoids using a QRegExp because QRegExp might be broken. */ |
541 |
541 |
542 /* Sample format: 4,000 msec per iteration (total: 4000, iterations: 1) */ |
542 /* Sample format: 4,000 msec per iteration (total: 4,000, iterations: 1) */ |
543 |
543 |
544 QString sFirstNumber; |
544 QString sFirstNumber; |
545 while (!remaining.isEmpty() && !remaining.at(0).isSpace()) { |
545 while (!remaining.isEmpty() && !remaining.at(0).isSpace()) { |
546 sFirstNumber += remaining.at(0); |
546 sFirstNumber += remaining.at(0); |
547 remaining.remove(0,1); |
547 remaining.remove(0,1); |
571 return out; |
571 return out; |
572 } |
572 } |
573 |
573 |
574 remaining = remaining.mid(sizeof(periterbit)-1); |
574 remaining = remaining.mid(sizeof(periterbit)-1); |
575 |
575 |
576 /* Remaining: 4000, iterations: 1) */ |
576 /* Remaining: 4,000, iterations: 1) */ |
577 static const char itersbit[] = ", iterations: "; |
577 static const char itersbit[] = ", iterations: "; |
578 QString sTotal; |
578 QString sTotal; |
579 while (!remaining.startsWith(itersbit) && !remaining.isEmpty()) { |
579 while (!remaining.startsWith(itersbit) && !remaining.isEmpty()) { |
580 sTotal += remaining.at(0); |
580 sTotal += remaining.at(0); |
581 remaining.remove(0,1); |
581 remaining.remove(0,1); |
585 return out; |
585 return out; |
586 } |
586 } |
587 |
587 |
588 remaining = remaining.mid(sizeof(itersbit)-1); |
588 remaining = remaining.mid(sizeof(itersbit)-1); |
589 |
589 |
590 qint64 total = sTotal.toLongLong(&ok); |
590 /* 4,000 -> 4000 */ |
|
591 sTotal.remove(','); |
|
592 |
|
593 double total = sTotal.toDouble(&ok); |
591 if (!ok) { |
594 if (!ok) { |
592 if (error) *error = sTotal + " (total) is not a valid integer"; |
595 if (error) *error = sTotal + " (total) is not a valid number"; |
593 return out; |
596 return out; |
594 } |
597 } |
595 |
598 |
596 /* Remaining: 1) */ |
599 /* Remaining: 1) */ |
597 QString sIters; |
600 QString sIters; |