Skip to content

Commit 4967a60

Browse files
eivindjahreneivindjahren
committed
Rename geo_polygon_(struct|type) to rd::Polygon
1 parent 66bd4ba commit 4967a60

16 files changed

Lines changed: 98 additions & 98 deletions

‎lib/geometry/geo_polygon.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515

1616
#include <ert/geometry/geo_polygon.hpp>
1717

18-
void geo_polygon_add_point(geo_polygon_type *polygon, double x, double y) {
18+
void geo_polygon_add_point(rd::Polygon *polygon, double x, double y) {
1919
polygon->xcoord.push_back(x);
2020
polygon->ycoord.push_back(y);
2121
}
2222

23-
void geo_polygon_add_point_front(geo_polygon_type *polygon, double x,
23+
void geo_polygon_add_point_front(rd::Polygon *polygon, double x,
2424
double y) {
2525
polygon->xcoord.insert(polygon->xcoord.begin(), x);
2626
polygon->ycoord.insert(polygon->ycoord.begin(), y);
2727
}
2828

29-
void geo_polygon_close(geo_polygon_type *polygon) {
29+
void geo_polygon_close(rd::Polygon *polygon) {
3030
double x = polygon->xcoord.at(0);
3131
double y = polygon->ycoord.at(0);
3232
geo_polygon_add_point(polygon, x, y);
@@ -60,7 +60,7 @@ static bool on_edge(double x1, double y1, double x2, double y2, double x0,
6060
edge will be identified as inside. If the force_edge_inside variable
6161
is set to false the behaviour on the edges is undefined.
6262
*/
63-
bool geo_polygon_contains_point(const geo_polygon_type *polygon, double x0,
63+
bool geo_polygon_contains_point(const rd::Polygon *polygon, double x0,
6464
double y0, bool force_edge_inside) {
6565
bool inside = false;
6666
double y = y0;
@@ -117,13 +117,13 @@ bool geo_polygon_contains_point(const geo_polygon_type *polygon, double x0,
117117
included.
118118
*/
119119

120-
geo_polygon_type *geo_polygon_fload_alloc_irap(const char *filename) {
120+
rd::Polygon *geo_polygon_fload_alloc_irap(const char *filename) {
121121
std::string sfile{filename};
122122
std::ifstream stream{sfile};
123123
if (!stream)
124124
throw std::ios_base::failure("Failed to open: " + sfile);
125125

126-
auto polygon = std::make_unique<geo_polygon_struct>(filename);
126+
auto polygon = std::make_unique<rd::Polygon>(filename);
127127
double x, y, z;
128128

129129
while (stream >> x >> y >> z) {
@@ -146,16 +146,16 @@ geo_polygon_type *geo_polygon_fload_alloc_irap(const char *filename) {
146146
return polygon.release();
147147
}
148148

149-
void geo_polygon_reset(geo_polygon_type *polygon) {
149+
void geo_polygon_reset(rd::Polygon *polygon) {
150150
polygon->xcoord.resize(0);
151151
polygon->ycoord.resize(0);
152152
}
153153

154-
size_t geo_polygon_get_size(const geo_polygon_type *polygon) {
154+
size_t geo_polygon_get_size(const rd::Polygon *polygon) {
155155
return polygon->xcoord.size();
156156
}
157157

158-
void geo_polygon_iget_xy(const geo_polygon_type *polygon, int index, double *x,
158+
void geo_polygon_iget_xy(const rd::Polygon *polygon, int index, double *x,
159159
double *y) {
160160
*x = polygon->xcoord.at(index);
161161
*y = polygon->ycoord.at(index);
@@ -229,7 +229,7 @@ static XLinesStatus xsegments(const std::array<std::array<double, 2>, 4> points,
229229
}
230230
}
231231

232-
bool geo_polygon_segment_intersects(const geo_polygon_type *polygon, double x1,
232+
bool geo_polygon_segment_intersects(const rd::Polygon *polygon, double x1,
233233
double y1, double x2, double y2) {
234234
if (polygon->xcoord.empty())
235235
return false;
@@ -257,18 +257,18 @@ bool geo_polygon_segment_intersects(const geo_polygon_type *polygon, double x1,
257257
return false;
258258
}
259259

260-
const char *geo_polygon_get_name(const geo_polygon_type *polygon) {
260+
const char *geo_polygon_get_name(const rd::Polygon *polygon) {
261261
return polygon->name.has_value() ? (*polygon->name).c_str() : nullptr;
262262
}
263263

264-
void geo_polygon_set_name(geo_polygon_type *polygon, const char *name) {
264+
void geo_polygon_set_name(rd::Polygon *polygon, const char *name) {
265265
if (name)
266266
polygon->name = name;
267267
else
268268
polygon->name = std::nullopt;
269269
}
270270

271-
double geo_polygon_get_length(geo_polygon_type *polygon) {
271+
double geo_polygon_get_length(rd::Polygon *polygon) {
272272
if (polygon->xcoord.size() == 1)
273273
return 0;
274274
else {
@@ -303,8 +303,8 @@ static bool approx_equal(const std::vector<double> &a,
303303
/*
304304
Name is ignored in the comparison.
305305
*/
306-
bool geo_polygon_equal(const geo_polygon_type *polygon1,
307-
const geo_polygon_type *polygon2) {
306+
bool geo_polygon_equal(const rd::Polygon *polygon1,
307+
const rd::Polygon *polygon2) {
308308
bool equal = polygon1->xcoord == polygon2->xcoord &&
309309
polygon1->ycoord == polygon2->ycoord;
310310

‎lib/geometry/geo_polygon_collection.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
struct geo_polygon_collection_struct {
1616
UTIL_TYPE_ID_DECLARATION;
1717
vector_ptr polygon_list = new_vector();
18-
std::map<std::string, geo_polygon_type *> polygon_map;
18+
std::map<std::string, rd::Polygon *> polygon_map;
1919
};
2020

2121
UTIL_IS_INSTANCE_FUNCTION(geo_polygon_collection,
@@ -31,33 +31,33 @@ int geo_polygon_collection_size(const geo_polygon_collection_type *polygons) {
3131
return vector_get_size(polygons->polygon_list.get());
3232
}
3333

34-
geo_polygon_type *
34+
rd::Polygon *
3535
geo_polygon_collection_create_polygon(geo_polygon_collection_type *polygons,
3636
const char *name) {
37-
geo_polygon_struct *polygon{nullptr};
37+
rd::Polygon *polygon{nullptr};
3838
bool create_polygon = true;
3939

4040
if (name && geo_polygon_collection_has_polygon(polygons, name))
4141
create_polygon = false;
4242

4343
if (create_polygon) {
44-
polygon = new geo_polygon_struct(name);
44+
polygon = new rd::Polygon(name);
4545
geo_polygon_collection_add_polygon(polygons, polygon, true);
4646
}
4747

4848
return polygon;
4949
}
5050

5151
bool geo_polygon_collection_add_polygon(geo_polygon_collection_type *polygons,
52-
geo_polygon_type *polygon,
52+
rd::Polygon *polygon,
5353
bool polygon_owner) {
5454
const char *name = geo_polygon_get_name(polygon);
5555
if (geo_polygon_collection_has_polygon(polygons, name))
5656
return false;
5757
else {
5858
if (polygon_owner)
5959
vector_append_owned_ref(polygons->polygon_list.get(), polygon,
60-
[](void *arg) {delete static_cast<geo_polygon_struct *>(arg);});
60+
[](void *arg) {delete static_cast<rd::Polygon *>(arg);});
6161
else
6262
vector_append_ref(polygons->polygon_list.get(), polygon);
6363

@@ -80,13 +80,13 @@ void geo_polygon_collection_free(geo_polygon_collection_type *polygons) {
8080
delete polygons;
8181
}
8282

83-
geo_polygon_type *
83+
rd::Polygon *
8484
geo_polygon_collection_iget_polygon(const geo_polygon_collection_type *polygons,
8585
int index) {
86-
return (geo_polygon_type *)vector_iget(polygons->polygon_list.get(), index);
86+
return (rd::Polygon *)vector_iget(polygons->polygon_list.get(), index);
8787
}
8888

89-
geo_polygon_type *
89+
rd::Polygon *
9090
geo_polygon_collection_get_polygon(const geo_polygon_collection_type *polygons,
9191
const char *polygon_name) {
9292
return polygons->polygon_map.at(polygon_name);

‎lib/geometry/geo_polygon_collection_pybind.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
namespace py = pybind11;
1212

1313
namespace {
14-
py::object create_polyline_ref(geo_polygon_type *polygon, py::handle parent) {
14+
py::object create_polyline_ref(rd::Polygon *polygon, py::handle parent) {
1515
if (!polygon)
1616
return py::none();
1717
return CPolyline().attr("createCReference")(
@@ -68,6 +68,6 @@ PYBIND11_MODULE(_cpolyline_collection, m) {
6868
[](py::handle self, py::handle polyline, bool polygon_owner) {
6969
geo_polygon_collection_add_polygon(
7070
from_cwrap<geo_polygon_collection_type>(self),
71-
from_cwrap<geo_polygon_type>(polyline), polygon_owner);
71+
from_cwrap<rd::Polygon>(polyline), polygon_owner);
7272
});
7373
}

‎lib/geometry/geo_polygon_pybind.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ PYBIND11_MODULE(_cpolyline, m) {
2121
"_alloc_new",
2222
[](std::optional<std::string> name) {
2323
return reinterpret_cast<std::uintptr_t>(
24-
new geo_polygon_struct(name));
24+
new rd::Polygon(name));
2525
},
2626
py::return_value_policy::reference);
2727
m.def(
@@ -32,45 +32,45 @@ PYBIND11_MODULE(_cpolyline, m) {
3232
},
3333
py::return_value_policy::reference);
3434
m.def("_add_point", [](py::handle self, double x, double y) {
35-
geo_polygon_add_point(from_cwrap<geo_polygon_type>(self), x, y);
35+
geo_polygon_add_point(from_cwrap<rd::Polygon>(self), x, y);
3636
});
3737
m.def("_add_point_front", [](py::handle self, double x, double y) {
38-
geo_polygon_add_point_front(from_cwrap<geo_polygon_type>(self), x, y);
38+
geo_polygon_add_point_front(from_cwrap<rd::Polygon>(self), x, y);
3939
});
4040
m.def("_free", [](py::handle self) {
41-
delete from_cwrap<geo_polygon_type>(self);
41+
delete from_cwrap<rd::Polygon>(self);
4242
});
4343
m.def("_size", [](py::handle self) {
44-
return geo_polygon_get_size(from_cwrap<geo_polygon_type>(self));
44+
return geo_polygon_get_size(from_cwrap<rd::Polygon>(self));
4545
});
4646
m.def("_iget_xy", [](py::handle self, int index) {
4747
double x = 0;
4848
double y = 0;
49-
geo_polygon_iget_xy(from_cwrap<geo_polygon_type>(self), index, &x, &y);
49+
geo_polygon_iget_xy(from_cwrap<rd::Polygon>(self), index, &x, &y);
5050
return std::make_tuple(x, y);
5151
});
5252
m.def("_segment_intersects",
5353
[](py::handle self, double x1, double y1, double x2, double y2) {
5454
return geo_polygon_segment_intersects(
55-
from_cwrap<geo_polygon_type>(self), x1, y1, x2, y2);
55+
from_cwrap<rd::Polygon>(self), x1, y1, x2, y2);
5656
});
5757
m.def("_get_name", [](py::handle self) -> py::object {
5858
const char *name =
59-
geo_polygon_get_name(from_cwrap<geo_polygon_type>(self));
59+
geo_polygon_get_name(from_cwrap<rd::Polygon>(self));
6060
if (!name)
6161
return py::none();
6262
return py::str(name);
6363
});
6464
m.def("_set_name", [](py::handle self, std::optional<std::string> name) {
65-
geo_polygon_set_name(from_cwrap<geo_polygon_type>(self),
65+
geo_polygon_set_name(from_cwrap<rd::Polygon>(self),
6666
name ? name->c_str() : nullptr);
6767
});
6868
m.def("_segment_length", [](py::handle self) {
69-
return geo_polygon_get_length(from_cwrap<geo_polygon_type>(self));
69+
return geo_polygon_get_length(from_cwrap<rd::Polygon>(self));
7070
});
7171
m.def("_equal", [](py::handle self, py::handle other) {
72-
return geo_polygon_equal(from_cwrap<geo_polygon_type>(self),
73-
from_cwrap<geo_polygon_type>(other));
72+
return geo_polygon_equal(from_cwrap<rd::Polygon>(self),
73+
from_cwrap<rd::Polygon>(other));
7474
});
7575
}
7676
} // namespace

‎lib/geometry/geo_region.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void geo_region_reset(geo_region_type *region) {
4242
void geo_region_free(geo_region_type *region) { delete region; }
4343

4444
static void geo_region_polygon_select__(geo_region_type *region,
45-
const geo_polygon_type *polygon,
45+
const rd::Polygon *polygon,
4646
bool select_inside, bool select) {
4747
for (size_t i = 0; i < region->size(); i++) {
4848
double x, y;
@@ -61,22 +61,22 @@ static void geo_region_polygon_select__(geo_region_type *region,
6161
}
6262

6363
void geo_region_select_inside_polygon(geo_region_type *region,
64-
const geo_polygon_type *polygon) {
64+
const rd::Polygon *polygon) {
6565
geo_region_polygon_select__(region, polygon, true, true);
6666
}
6767

6868
void geo_region_select_outside_polygon(geo_region_type *region,
69-
const geo_polygon_type *polygon) {
69+
const rd::Polygon *polygon) {
7070
geo_region_polygon_select__(region, polygon, false, true);
7171
}
7272

7373
void geo_region_deselect_inside_polygon(geo_region_type *region,
74-
const geo_polygon_type *polygon) {
74+
const rd::Polygon *polygon) {
7575
geo_region_polygon_select__(region, polygon, true, false);
7676
}
7777

7878
void geo_region_deselect_outside_polygon(geo_region_type *region,
79-
const geo_polygon_type *polygon) {
79+
const rd::Polygon *polygon) {
8080
geo_region_polygon_select__(region, polygon, false, false);
8181
}
8282

‎lib/geometry/geo_region_pybind.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,22 +50,22 @@ PYBIND11_MODULE(_geo_region, m) {
5050

5151
m.def("_select_inside_polygon", [](py::handle self, py::handle polygon) {
5252
geo_region_select_inside_polygon(from_cwrap<geo_region_type>(self),
53-
from_cwrap<geo_polygon_type>(polygon));
53+
from_cwrap<rd::Polygon>(polygon));
5454
});
5555
m.def("_select_outside_polygon", [](py::handle self, py::handle polygon) {
5656
geo_region_select_outside_polygon(
5757
from_cwrap<geo_region_type>(self),
58-
from_cwrap<geo_polygon_type>(polygon));
58+
from_cwrap<rd::Polygon>(polygon));
5959
});
6060
m.def("_deselect_inside_polygon", [](py::handle self, py::handle polygon) {
6161
geo_region_deselect_inside_polygon(
6262
from_cwrap<geo_region_type>(self),
63-
from_cwrap<geo_polygon_type>(polygon));
63+
from_cwrap<rd::Polygon>(polygon));
6464
});
6565
m.def("_deselect_outside_polygon", [](py::handle self, py::handle polygon) {
6666
geo_region_deselect_outside_polygon(
6767
from_cwrap<geo_region_type>(self),
68-
from_cwrap<geo_polygon_type>(polygon));
68+
from_cwrap<rd::Polygon>(polygon));
6969
});
7070

7171
m.def("_select_above_line", [](py::handle self, std::vector<double> xcoords,

‎lib/include/ert/geometry/geo_polygon.hpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,31 @@
77
#include <vector>
88

99

10-
struct geo_polygon_struct {
10+
namespace rd {
11+
struct Polygon {
1112
std::vector<double> xcoord;
1213
std::vector<double> ycoord;
1314
std::optional<std::string> name;
1415

15-
geo_polygon_struct(std::optional<std::string> name)
16+
Polygon(std::optional<std::string> name)
1617
: name(std::move(name)) {};
1718
};
19+
}
1820

19-
typedef struct geo_polygon_struct geo_polygon_type;
20-
21-
void geo_polygon_add_point(geo_polygon_type *polygon, double x, double y);
22-
void geo_polygon_add_point_front(geo_polygon_type *polygon, double x, double y);
23-
geo_polygon_type *geo_polygon_fload_alloc_irap(const char *filename);
24-
bool geo_polygon_contains_point(const geo_polygon_type *polygon, double x,
21+
void geo_polygon_add_point(rd::Polygon *polygon, double x, double y);
22+
void geo_polygon_add_point_front(rd::Polygon *polygon, double x, double y);
23+
rd::Polygon *geo_polygon_fload_alloc_irap(const char *filename);
24+
bool geo_polygon_contains_point(const rd::Polygon *polygon, double x,
2525
double y, bool force_edge_inside = false);
26-
void geo_polygon_reset(geo_polygon_type *polygon);
27-
void geo_polygon_close(geo_polygon_type *polygoon);
28-
size_t geo_polygon_get_size(const geo_polygon_type *polygon);
29-
void geo_polygon_iget_xy(const geo_polygon_type *polygon, int index, double *x,
26+
void geo_polygon_reset(rd::Polygon *polygon);
27+
void geo_polygon_close(rd::Polygon *polygoon);
28+
size_t geo_polygon_get_size(const rd::Polygon *polygon);
29+
void geo_polygon_iget_xy(const rd::Polygon *polygon, int index, double *x,
3030
double *y);
31-
bool geo_polygon_segment_intersects(const geo_polygon_type *polygon, double x1,
31+
bool geo_polygon_segment_intersects(const rd::Polygon *polygon, double x1,
3232
double y1, double x2, double y2);
33-
const char *geo_polygon_get_name(const geo_polygon_type *polygon);
34-
void geo_polygon_set_name(geo_polygon_type *polygon, const char *name);
35-
double geo_polygon_get_length(geo_polygon_type *polygon);
36-
bool geo_polygon_equal(const geo_polygon_type *polygon1,
37-
const geo_polygon_type *polygon2);
33+
const char *geo_polygon_get_name(const rd::Polygon *polygon);
34+
void geo_polygon_set_name(rd::Polygon *polygon, const char *name);
35+
double geo_polygon_get_length(rd::Polygon *polygon);
36+
bool geo_polygon_equal(const rd::Polygon *polygon1,
37+
const rd::Polygon *polygon2);

‎lib/include/ert/geometry/geo_polygon_collection.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ typedef struct geo_polygon_collection_struct geo_polygon_collection_type;
88
geo_polygon_collection_type *geo_polygon_collection_alloc();
99
void geo_polygon_collection_free(geo_polygon_collection_type *polygons);
1010
int geo_polygon_collection_size(const geo_polygon_collection_type *polygons);
11-
geo_polygon_type *
11+
rd::Polygon *
1212
geo_polygon_collection_create_polygon(geo_polygon_collection_type *polygons,
1313
const char *name);
1414
bool geo_polygon_collection_has_polygon(
1515
const geo_polygon_collection_type *polygons, const char *name);
1616
bool geo_polygon_collection_add_polygon(geo_polygon_collection_type *polygons,
17-
geo_polygon_type *polygon,
17+
rd::Polygon *polygon,
1818
bool polygon_owner);
19-
geo_polygon_type *
19+
rd::Polygon *
2020
geo_polygon_collection_iget_polygon(const geo_polygon_collection_type *polygons,
2121
int index);
22-
geo_polygon_type *
22+
rd::Polygon *
2323
geo_polygon_collection_get_polygon(const geo_polygon_collection_type *polygons,
2424
const char *polygon_name);
2525

0 commit comments

Comments
 (0)