Skip to content

Commit

Permalink
Properly initialize member variables when a new PointView is processed.
Browse files Browse the repository at this point in the history
  • Loading branch information
@abellgithub
abellgithub committed Apr 30, 2019
1 parent 6c0ff27 commit c515892
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 121 deletions.
20 changes: 10 additions & 10 deletions filters/ChipperFilter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,15 @@ PointViewSet ChipperFilter::run(PointViewPtr view)
return m_outViews;

m_inView = view;
m_partitions.resize(0);
m_xvec.resize(0);
m_yvec.resize(0);
m_spare.resize(view->size());
m_outViews.clear();

m_xvec.reserve(view->size());
m_yvec.reserve(view->size());

load(*view.get(), m_xvec, m_yvec, m_spare);
partition(m_xvec.size());
decideSplit(m_xvec, m_yvec, m_spare, 0, m_partitions.size() - 1);
Expand All @@ -101,13 +110,6 @@ PointViewSet ChipperFilter::run(PointViewPtr view)
void ChipperFilter::load(PointView& view, ChipRefList& xvec, ChipRefList& yvec,
ChipRefList& spare)
{
point_count_t idx;
std::vector<ChipPtRef>::iterator it;

xvec.reserve(view.size());
yvec.reserve(view.size());
spare.resize(view.size());

for (PointId i = 0; i < view.size(); ++i)
{
ChipPtRef xref;
Expand All @@ -127,7 +129,7 @@ void ChipperFilter::load(PointView& view, ChipRefList& xvec, ChipRefList& yvec,
std::stable_sort(xvec.begin(), xvec.end());
for (size_t i = 0; i < xvec.size(); ++i)
{
idx = xvec[i].m_ptindex;
point_count_t idx = xvec[i].m_ptindex;
yvec[idx].m_oindex = i;
}

Expand All @@ -140,8 +142,6 @@ void ChipperFilter::load(PointView& view, ChipRefList& xvec, ChipRefList& yvec,
}




#ifdef _WIN32
inline long lround(double d)
{
Expand Down
3 changes: 2 additions & 1 deletion scripts/docker/alpine/Dockerfile.dependencies
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.8
FROM alpine:3.9

#
# Nitro looks for unistd.h in the wrong place.
Expand Down Expand Up @@ -52,6 +52,7 @@ RUN \
postgresql-dev \
sqlite-dev \
libcrypto1.1@edgemain \
xerces-c@edgetesting \
libspatialite-dev@edgetesting \
gdal-dev@edgetesting \
libgeotiff-dev@edgetesting \
Expand Down
134 changes: 24 additions & 110 deletions test/unit/filters/ChipperTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,30 @@ TEST(ChipperTest, test_construction)
}


// Test that the chipper runs with multiple inputs.
TEST(ChipperTest, issue_2479)
{
PointTable table;
PointViewPtr view(new PointView(table));

LasReader r1;
LasReader r2;
Options rOpts;

rOpts.add("filename", Support::datapath("las/autzen_trim.las"));
r1.setOptions(rOpts);
r2.setOptions(rOpts);

ChipperFilter chipper;
chipper.setInput(r1);
chipper.setInput(r2);

chipper.prepare(table);
PointViewSet viewSet = chipper.execute(table);

EXPECT_EQ(viewSet.size(), 44u);
}

// Make sure things don't crash if the point buffer is empty.
TEST(ChipperTest, empty_buffer)
{
Expand All @@ -120,113 +144,3 @@ TEST(ChipperTest, empty_buffer)
EXPECT_EQ(viewSet.size(), 0u);
}

//ABELL
/**
TEST(ChipperTest, test_ordering)
{
std::string candidate_filename(Support::datapath("autzen-utm.las"));
std::string source_filename(Support::datapath("autzen-utm-chipped-25.las"));
Options options;
Option filename("filename", source_filename, "");
options.add(filename);
Option capacity("capacity", 25);
options.add(capacity);
LasReader candidate_reader(options);
std::shared_ptr<ChipperFilter> chipper(new ChipperFilter)(options);
chipper->setInput(&candidate_reader);
chipper->prepare();
Option& query = options.getOptionByRef("filename");
query.setValue<std::string>(source_filename);
LasReader source_reader(options);
source_reader.prepare();
EXPECT_EQ(chipper->getNumPoints(), source_reader.getNumPoints());
PointView candidate(chipper->getSchema(), chipper->getNumPoints());
PointView patch(chipper->getSchema(), chipper->getNumPoints());
StageSequentialIterator* iter_c = chipper->createSequentialIterator(patch);
uint64_t numRead(0);
while (true)
{
numRead = iter_c->read(patch);
if (! numRead)
break;
candidate.copyPointsFast(candidate.getNumPoints(), 0, patch, patch.getNumPoints());
candidate.setNumPoints(candidate.getNumPoints() + patch.getNumPoints());
}
EXPECT_EQ(candidate.getNumPoints(), chipper->getNumPoints());
PointView source(source_reader.getSchema(), source_reader.getNumPoints());
StageSequentialIterator* iter_s = source_reader.createSequentialIterator(source);
numRead = iter_s->read(source);
EXPECT_EQ(numRead, source_reader.getNumPoints());
Schema const& cs = candidate.getSchema();
Schema const& ss = source.getSchema();
Dimension const& sdimX = ss.getDimension("X");
Dimension const& sdimY = ss.getDimension("Y");
Dimension const& sdimZ = ss.getDimension("Z");
Dimension const& sdimIntensity = ss.getDimension("Intensity");
Dimension const& sdimRed = ss.getDimension("Red");
Dimension const& sdimGreen = ss.getDimension("Green");
Dimension const& sdimBlue = ss.getDimension("Blue");
Dimension const& cdimX = cs.getDimension("X");
Dimension const& cdimY = cs.getDimension("Y");
Dimension const& cdimZ = cs.getDimension("Z");
Dimension const& cdimIntensity = cs.getDimension("Intensity");
Dimension const& cdimRed = cs.getDimension("Red");
Dimension const& cdimGreen = cs.getDimension("Green");
Dimension const& cdimBlue = cs.getDimension("Blue");
//
// int X[] = { 49405730, 49413382, 49402110, 494192890, 49418622, 49403411 };
// int Y[] = { 487743335, 487743982, 487743983, 487744219, 487744254, 487745019 };
// int Z[] = { 13063, 13044, 13046, 13050, 13049, 13066 };
// int I[] = { 134, 75, 153, 93, 67, 167 };
// int R[] = { 142, 152, 146, 104, 113, 163 };
// int G[] = { 102, 108, 104, 96, 97, 118 };
// int B[] = { 137, 134, 140, 120, 123, 150 };
//
for (unsigned i = 0; i < candidate.getNumPoints(); ++i)
{
int32_t sx = source.getField<int32_t>(sdimX, i);
int32_t sy = source.getField<int32_t>(sdimY, i);
int32_t sz = source.getField<int32_t>(sdimZ, i);
uint16_t sintensity = source.getField<uint16_t>(sdimIntensity, i);
uint16_t sred = source.getField<uint16_t>(sdimRed, i);
uint16_t sgreen = source.getField<uint16_t>(sdimGreen, i);
uint16_t sblue = source.getField<uint16_t>(sdimBlue, i);
int32_t cx = candidate.getField<int32_t>(cdimX, i);
int32_t cy = candidate.getField<int32_t>(cdimY, i);
int32_t cz = candidate.getField<int32_t>(cdimZ, i);
uint16_t cintensity = candidate.getField<uint16_t>(cdimIntensity, i);
uint16_t cred = candidate.getField<uint16_t>(cdimRed, i);
uint16_t cgreen = candidate.getField<uint16_t>(cdimGreen, i);
uint16_t cblue = candidate.getField<uint16_t>(cdimBlue, i);
EXPECT_EQ(sx, cx);
EXPECT_EQ(sy, cy);
EXPECT_EQ(sz, cz);
EXPECT_EQ(sintensity, cintensity);
EXPECT_EQ(sred, cred);
EXPECT_EQ(sgreen, cgreen);
EXPECT_EQ(sblue, cblue);
}
delete iter_c;
delete iter_s;
}
**/

0 comments on commit c515892

Please sign in to comment.