Compare commits

...

12 Commits

Author SHA1 Message Date
ec0a31db5d Small typo 2024-05-07 11:00:49 +02:00
esther
32a0b18f8e Merge branch 'main' of gitlab.com:Trygve/contour-creator 2024-05-07 10:58:15 +02:00
esther
ab96f9477e added some comments 2024-05-07 10:48:48 +02:00
790cf44f8b bugfix 2024-05-07 10:35:31 +02:00
df7cac1095 cleanup 2024-05-07 10:34:29 +02:00
93fcbc6a39 Merge branch 'drawing-lines' 2024-05-07 10:25:01 +02:00
95649f005b ITS WORKING (somewhat) 2024-05-06 23:50:11 +02:00
1ec3e8c778 slides 2024-05-06 14:16:04 +02:00
c535eec958 Debugging without omp 2024-05-06 11:37:10 +02:00
4f709d3b07 Use linked list to store the order of the points 2024-05-05 16:53:00 +02:00
4cd4f773bf Fixed stupid mistake in for loop 2024-05-03 20:54:45 +02:00
9d8df3256d Started on continus line drawing 2024-05-03 20:33:28 +02:00
5 changed files with 3199 additions and 80 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 MiB

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 88 KiB

View File

@ -5,16 +5,31 @@ author:
- Trygve og Esther - Trygve og Esther
--- ---
# What are contours
# Output of our program # Output of our program:
pretty pictures ![Contour map of Ås](kurver_ås.png)
# Marching squares
![By Nicoguaro; Adroitwhiz - File:Marching_squares_algorithm.svg, CC BY-SA 4.0, https://commons.wikimedia.org/w/index.php?curid=143418710](ms_wikipedia.svg)
# The logical flow of our program # The logical flow of our program
flowchart ```cpp
int main(int argc, const char* argv[])
# GDAL {
What is it? const char* filepath = argv[1];
HeightMap map(filepath);
map.blur(0.8)
auto lines = create_lines(&map, 5);
write_output_file(cellmaps, "out.geojson", &map);
}
```
# Performance # Performance
show the benchmarks | | Time |
|--------------------|--------------------|
| 12 threads | 41s |
| 1 thread | 116s |
# Problems we encountered

View File

@ -43,13 +43,10 @@ class Point
int x; int x;
int y; int y;
int mscase; int mscase;
Point * next; bool allocated = false;
Point * previous;
Point(int x, int y, int mscase){ Point(int x, int y, int mscase){
this -> x = x; this -> x = x;
this -> y = y; this -> y = y;
this -> mscase = mscase; this -> mscase = mscase;
this -> next = nullptr;
this -> previous = nullptr;
}; };
}; };

View File

@ -5,7 +5,6 @@
#include <gdal/ogr_feature.h> #include <gdal/ogr_feature.h>
#include <gdal/ogr_geometry.h> #include <gdal/ogr_geometry.h>
#include <iostream> #include <iostream>
#include <iterator>
#include <ostream> #include <ostream>
#include <vector> #include <vector>
#include <cstdint> #include <cstdint>
@ -22,28 +21,21 @@ std::vector<Point> produce_cellmap(HeightMap* heightmap, float z)
for (int i = 0; i<length; i++) { for (int i = 0; i<length; i++) {
int y = i/(heightmap->width-1); int y = i/(heightmap->width-1);
int x = i%(heightmap->width-1); int x = i%(heightmap->width-1);
uint8_t result = (heightmap->get_pixel(x,y)>z) + uint8_t result = (heightmap->get_pixel(x,y)>z)*8 +
(heightmap->get_pixel(x+1,y)>z)*2 + (heightmap->get_pixel(x+1,y)>z)*4 +
(heightmap->get_pixel(x+1,y+1)>z)*4 + (heightmap->get_pixel(x+1,y+1)>z)*2 +
(heightmap->get_pixel(x,y+1)>z)*8; (heightmap->get_pixel(x,y+1)>z);
if (result != 0 and result != 15 ) { if (result != 0 and result != 15 ) {
points.push_back(Point(x, y, result)); points.push_back(Point(x, y, result));
}; };
} }
return points; return points;
} }
std::vector<std::vector<Point>> create_lines(HeightMap* heightmap, int interval)
std::vector<std::vector<Point>> vector_cellmap(HeightMap* heightmap, int interval)
{ {
int num_contours = (heightmap->max - heightmap->min)/interval; int num_contours = (heightmap->max - heightmap->min)/interval;
std::vector<std::vector<Point>> vector_contours; std::vector<std::vector<Point>> vector_contours;
omp_set_num_threads(12);
#pragma omp parallel #pragma omp parallel
{ {
@ -52,27 +44,67 @@ std::vector<std::vector<Point>> vector_cellmap(HeightMap* heightmap, int interva
for (int i = 1; i <= num_contours; i++) for (int i = 1; i <= num_contours; i++)
{ {
auto points = produce_cellmap(heightmap, heightmap->min + interval*i); auto points = produce_cellmap(heightmap, heightmap->min + interval*i);
std::vector<Point> line;
int x;
int y;
int points_allocated = 0;
x = points[0].x;
y = points[0].y;
points[0].allocated = true;
line.push_back(points[0]);
for (int j = 0; j < points.size(); j++){ for (int j = 0; j < points.size(); j++){
Point current = points[j];
//std::cout << points_allocated << " " << points.size() << "\n";
for (int k = 0; k < points.size(); k++){ for (int k = 0; k < points.size(); k++){
Point candidate = points[k]; Point* candidate = &points[k];
if (candidate.next != nullptr) { if (!candidate->allocated) {
if (candidate.x +1 == current.x) { if (candidate->x == x +1 && candidate->y == y) {
current.next = &candidate; candidate->allocated = true;
x = candidate->x;
y = candidate->y;
line.push_back(*candidate);
points_allocated++;
break;
} }
else if (candidate.x -1 == current.x) { else if (candidate->x == x -1 && candidate->y == y) {
current.next = &candidate; x = candidate->x;
y = candidate->y;
candidate->allocated = true;
line.push_back(*candidate);
points_allocated++;
break;
} }
else if (candidate.y +1 == current.x) { else if (candidate->x == x && candidate->y == y + 1) {
current.next = &candidate; x = candidate->x;
y = candidate->y;
candidate->allocated = true;
line.push_back(*candidate);
points_allocated++;
break;
} }
else if (candidate.y -1 == current.x) { else if (candidate->x == x && candidate->y == y - 1) {
current.next = &candidate; x = candidate->x;
y = candidate->y;
candidate->allocated = true;
line.push_back(*candidate);
points_allocated++;
break;
}
}
}
if (j > points_allocated)
{
vec_private.push_back(line);
line.clear();
//std::cout << points.size() << " ";
for (int k = 0; k < points.size(); k++){
Point* candidate = &points[k];
if (!candidate->allocated)
{
line.push_back(*candidate);
x = candidate->x;
y = candidate->y;
points_allocated++;
break;
} }
} }
} }
} }
@ -80,7 +112,6 @@ std::vector<std::vector<Point>> vector_cellmap(HeightMap* heightmap, int interva
#pragma omp critical #pragma omp critical
vector_contours.insert(vector_contours.end(), vec_private.begin(), vec_private.end()); vector_contours.insert(vector_contours.end(), vec_private.begin(), vec_private.end());
} }
return vector_contours; return vector_contours;
} }
@ -100,7 +131,7 @@ constexpr std::tuple<double, double, double, double> marching_squares_lookup(int
switch (mcase) { switch (mcase) {
case 1: return {0, 0.5, 0.5, 0}; case 1: return {0, 0.5, 0.5, 0};
case 2: return {1, 0.5, 0.5, 0}; case 2: return {1, 0.5, 0.5, 0};
case 3: return {0, 0.5, 1, 0}; case 3: return {0, 0.5, 1, 0.5};
case 4: return {0.5, 1, 1, 0.5}; case 4: return {0.5, 1, 1, 0.5};
case 5: return {0, 0, 0, 0}; //FIXME case 5: return {0, 0, 0, 0}; //FIXME
case 6: return {0.5, 1, 0.5, 0}; case 6: return {0.5, 1, 0.5, 0};
@ -140,7 +171,7 @@ void write_output_file(std::vector<std::vector<Point>> all_points, const char *f
OGRLayer *poLayer; OGRLayer *poLayer;
poLayer = poDS->CreateLayer( "contours", /*&(cellmaps[0]).reference_system*/ NULL, wkbLineString, NULL ); poLayer = poDS->CreateLayer( "contours", &heightmap->reference_system, wkbLineString, NULL );
if( poLayer == NULL ) if( poLayer == NULL )
{ {
printf( "Layer creation failed.\n" ); printf( "Layer creation failed.\n" );
@ -167,26 +198,15 @@ void write_output_file(std::vector<std::vector<Point>> all_points, const char *f
feature = OGRFeature::CreateFeature( poLayer->GetLayerDefn() ); feature = OGRFeature::CreateFeature( poLayer->GetLayerDefn() );
feature->SetField( "Name", j ); feature->SetField( "Name", j );
std::vector<Point> points = all_points[j]; std::vector<Point> points = all_points[j];
for (int i = 0; i < points.size(); i++) for (int k = 0; k < points.size(); k++)
{ {
int x_raw = points[k].x;
//int x_raw = i%width; int y_raw = points[k].y;
//int y_raw = i/height;
int x_raw = points[i].x;
int y_raw = points[i].y;
auto [x, y] = local_to_projected(heightmap->geotransform, x_raw, y_raw); auto [x, y] = local_to_projected(heightmap->geotransform, x_raw, y_raw);
//auto [x_bl, y_bl, x_tr, y_tr] = marching_squares_lookup(*(cellmap->cells + i) ); //auto [x_bl, y_bl, x_tr, y_tr] = marching_squares_lookup(*(cellmap->cells + i) );
//std::cout << x << ", " << y << " ";
//geometry->setPoint( geometry->getNumPoints(), x+x_tr*0.25, y+y_tr*0.25 );
//geometry->setPoint( geometry->getNumPoints(), x+x_bl*0.25, y+y_bl*0.25 );
geometry->setPoint(geometry->getNumPoints(),x ,y ); geometry->setPoint(geometry->getNumPoints(),x ,y );
} }
if ( feature->SetGeometry(geometry) != OGRERR_NONE) if ( feature->SetGeometry(geometry) != OGRERR_NONE)
@ -201,10 +221,7 @@ void write_output_file(std::vector<std::vector<Point>> all_points, const char *f
exit( 1 ); exit( 1 );
} }
OGRFeature::DestroyFeature( feature ); OGRFeature::DestroyFeature( feature );
} }
GDALClose( poDS ); GDALClose( poDS );
} }
@ -218,8 +235,6 @@ int main(int argc, const char* argv[])
map.blur(0.8); map.blur(0.8);
auto cellmap = produce_cellmap(&map, 40); auto lines = create_lines(&map, 5);
write_output_file(lines, "out.geojson", &map);
auto cellmaps = vector_cellmap(&map, 5);
write_output_file(cellmaps, "out.geojson", &map);
} }