mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2024-11-27 20:59:36 +08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

unittest: Use range-for-loops

Browse Source 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Stefan Weil 2019-03-25 09:33:56 +01:00
parent 631882a346
commit aaf8c50a12
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
unittest/linlsq_test.cc
View File

@ -30,8 +30,8 @@ class LLSQTest : public testing::Test {
}
FCOORD PtsMean(const std::vector<FCOORD>& pts) {
FCOORD total(0, 0);
for (size_t i = 0; i < pts.size(); i++) {
total += pts[i];
for (const auto& p : pts) {
total += p;
}
return (pts.size() > 0) ? total / pts.size() : total;
}
@ -41,9 +41,9 @@ class LLSQTest : public testing::Test {
FCOORD nvec = !orth;
nvec.normalise();
double expected_answer = 0;
for (size_t i = 0; i < pts.size(); i++) {
llsq.add(pts[i].x(), pts[i].y());
double dot = nvec % (pts[i] - xavg);
for (const auto& p : pts) {
llsq.add(p.x(), p.y());
double dot = nvec % (p - xavg);
expected_answer += dot * dot;
}
expected_answer /= pts.size();

20
unittest/stringrenderer_test.cc
View File

@ -12,14 +12,14 @@
#include <memory>
#include <string>
#include "absl/strings/str_split.h" // for absl::StrSplit
#include "absl/strings/str_split.h" // for absl::StrSplit
#include "include_gunit.h"
#include "allheaders.h"
#include "boxchar.h"
#include "boxread.h"
#include "commandlineflags.h"
#include "genericvector.h"
#include "include_gunit.h"
#include "stringrenderer.h"
#include "strngs.h"
@ -65,9 +65,9 @@ class StringRendererTest : public ::testing::Test {
if (!FLAGS_display) return;
const std::vector<BoxChar*>& boxchars = renderer_->GetBoxes();
Boxa* boxes = boxaCreate(0);
for (size_t i = 0; i < boxchars.size(); ++i) {
if (boxchars[i]->box())
boxaAddBox(boxes, const_cast<Box*>(boxchars[i]->box()), L_CLONE);
for (const auto& boxchar : boxchars) {
if (boxchar->box())
boxaAddBox(boxes, const_cast<Box*>(boxchar->box()), L_CLONE);
}
Pix* box_pix = pixDrawBoxaRandom(pix, boxes, 1);
boxaDestroy(&boxes);
@ -203,8 +203,8 @@ TEST_F(StringRendererTest, DoesRenderLigatures) {
static int FindBoxCharXCoord(const std::vector<BoxChar*>& boxchars,
const std::string& ch) {
for (size_t i = 0; i < boxchars.size(); ++i) {
if (boxchars[i]->ch() == ch) return boxchars[i]->box()->x;
for (const auto& boxchar : boxchars) {
if (boxchar->ch() == ch) return boxchar->box()->x;
}
return INT_MAX;
}
@ -223,8 +223,7 @@ TEST_F(StringRendererTest, ArabicBoxcharsInLTROrder) {
EXPECT_TRUE(ReadMemBoxes(0, false, boxes_str.c_str(), false, nullptr, &texts,
nullptr, nullptr));
std::string ltr_str;
for (int i = 0; i < texts.size(); ++i)
ltr_str += texts[i].string();
for (int i = 0; i < texts.size(); ++i) ltr_str += texts[i].string();
// The string should come out perfectly reversed, despite there being a
// ligature.
EXPECT_EQ(ltr_str, kRevWord);
@ -364,7 +363,8 @@ TEST_F(StringRendererTest, DoesRenderWordBoxes) {
renderer_->RenderToImage(kEngText, strlen(kEngText), &pix));
pixDestroy(&pix);
// Verify #boxchars = #words + #spaces
std::vector<std::string> words = absl::StrSplit(kEngText, ' ', absl::SkipEmpty());
std::vector<std::string> words =
absl::StrSplit(kEngText, ' ', absl::SkipEmpty());
const int kNumSpaces = words.size() - 1;
const int kExpectedNumBoxes = words.size() + kNumSpaces;
const std::vector<BoxChar*>& boxchars = renderer_->GetBoxes();