Skip to content

fix(Builder): remove uuid overloads of geological component setters #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BenPinet merged 1 commit into from
Oct 21, 2026
Merged

fix(Builder): remove uuid overloads of geological component setters #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions bindings/python/src/explicit/mixin/builder/fault_blocks_builder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,14 @@
pybind11::class_< FaultBlocksBuilder##dimension##D >( \
module, name##dimension.c_str() ) \
.def( "set_fault_block_name", \
static_cast< void ( FaultBlocksBuilder##dimension##D::* )( \
const FaultBlock##dimension##D&, std::string_view ) >( \
&FaultBlocksBuilder##dimension##D::set_fault_block_name ), \
pybind11::arg( "fault_block" ), pybind11::arg( "name" ) ) \
.def( "set_fault_block_name", \
static_cast< void ( FaultBlocksBuilder##dimension##D::* )( \
const uuid&, std::string_view ) >( \
&FaultBlocksBuilder##dimension##D::set_fault_block_name ), \
pybind11::arg( "fault_block_id" ), pybind11::arg( "name" ) )
&FaultBlocksBuilder##dimension##D::set_fault_block_name, \
pybind11::arg( "fault_block" ), pybind11::arg( "name" ) )

namespace geode
{
void define_fault_blocks_builder( pybind11::module& module )

Check failure on line 39 in bindings/python/src/explicit/mixin/builder/fault_blocks_builder.hpp

View workflow job for this annotation

GitHub Actions / test / tidy

bindings/python/src/explicit/mixin/builder/fault_blocks_builder.hpp:39:39 [clang-diagnostic-error] 

use of undeclared identifier 'pybind11'
{
PYTHON_FAULT_BLOCKS_BUILDER( 2 );

Check failure on line 41 in bindings/python/src/explicit/mixin/builder/fault_blocks_builder.hpp

View workflow job for this annotation

GitHub Actions / test / tidy

bindings/python/src/explicit/mixin/builder/fault_blocks_builder.hpp:41:9 [clang-diagnostic-error] 

use of undeclared identifier 'pybind11'

Check failure on line 41 in bindings/python/src/explicit/mixin/builder/fault_blocks_builder.hpp

View workflow job for this annotation

GitHub Actions / test / tidy

bindings/python/src/explicit/mixin/builder/fault_blocks_builder.hpp:41:9 [clang-diagnostic-error] 

unexpected type name 'FaultBlocksBuilder2D': expected expression
PYTHON_FAULT_BLOCKS_BUILDER( 3 );

Check failure on line 42 in bindings/python/src/explicit/mixin/builder/fault_blocks_builder.hpp

View workflow job for this annotation

GitHub Actions / test / tidy

bindings/python/src/explicit/mixin/builder/fault_blocks_builder.hpp:42:9 [clang-diagnostic-error] 

use of undeclared identifier 'pybind11'

Check failure on line 42 in bindings/python/src/explicit/mixin/builder/fault_blocks_builder.hpp

View workflow job for this annotation

GitHub Actions / test / tidy

bindings/python/src/explicit/mixin/builder/fault_blocks_builder.hpp:42:9 [clang-diagnostic-error] 

unexpected type name 'FaultBlocksBuilder3D': expected expression
}
} // namespace geode
23 changes: 3 additions & 20 deletions bindings/python/src/explicit/mixin/builder/faults_builder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,33 +30,16 @@
"FaultsBuilder" + std::to_string( dimension ) + "D"; \
pybind11::class_< FaultsBuilder##dimension##D >( \
module, name##dimension.c_str() ) \
.def( "set_fault_type", \
static_cast< void ( FaultsBuilder##dimension##D::* )( \
const Fault##dimension##D&, \
Fault##dimension##D::FAULT_TYPE ) >( \
&FaultsBuilder##dimension##D::set_fault_type ), \
.def( "set_fault_type", &FaultsBuilder##dimension##D::set_fault_type, \
pybind11::arg( "fault" ), pybind11::arg( "type" ) ) \
.def( "set_fault_type", \
static_cast< void ( FaultsBuilder##dimension##D::* )( \
const uuid&, Fault##dimension##D::FAULT_TYPE ) >( \
&FaultsBuilder##dimension##D::set_fault_type ), \
pybind11::arg( "fault_id" ), pybind11::arg( "type" ) ) \
.def( "set_fault_name", \
static_cast< void ( FaultsBuilder##dimension##D::* )( \
const Fault##dimension##D&, std::string_view ) >( \
&FaultsBuilder##dimension##D::set_fault_name ), \
pybind11::arg( "fault" ), pybind11::arg( "name" ) ) \
.def( "set_fault_name", \
static_cast< void ( FaultsBuilder##dimension##D::* )( \
const uuid&, std::string_view ) >( \
&FaultsBuilder##dimension##D::set_fault_name ), \
pybind11::arg( "fault_id" ), pybind11::arg( "name" ) )
.def( "set_fault_name", &FaultsBuilder##dimension##D::set_fault_name, \
pybind11::arg( "fault" ), pybind11::arg( "name" ) )

namespace geode
{
void define_faults_builder( pybind11::module& module )

Check failure on line 40 in bindings/python/src/explicit/mixin/builder/faults_builder.hpp

View workflow job for this annotation

GitHub Actions / test / tidy

bindings/python/src/explicit/mixin/builder/faults_builder.hpp:40:33 [clang-diagnostic-error] 

use of undeclared identifier 'pybind11'
{
PYTHON_FAULTS_BUILDER( 2 );

Check failure on line 42 in bindings/python/src/explicit/mixin/builder/faults_builder.hpp

View workflow job for this annotation

GitHub Actions / test / tidy

bindings/python/src/explicit/mixin/builder/faults_builder.hpp:42:9 [clang-diagnostic-error] 

use of undeclared identifier 'pybind11'

Check failure on line 42 in bindings/python/src/explicit/mixin/builder/faults_builder.hpp

View workflow job for this annotation

GitHub Actions / test / tidy

bindings/python/src/explicit/mixin/builder/faults_builder.hpp:42:9 [clang-diagnostic-error] 

unexpected type name 'FaultsBuilder2D': expected expression
PYTHON_FAULTS_BUILDER( 3 );

Check failure on line 43 in bindings/python/src/explicit/mixin/builder/faults_builder.hpp

View workflow job for this annotation

GitHub Actions / test / tidy

bindings/python/src/explicit/mixin/builder/faults_builder.hpp:43:9 [clang-diagnostic-error] 

use of undeclared identifier 'pybind11'

Check failure on line 43 in bindings/python/src/explicit/mixin/builder/faults_builder.hpp

View workflow job for this annotation

GitHub Actions / test / tidy

bindings/python/src/explicit/mixin/builder/faults_builder.hpp:43:9 [clang-diagnostic-error] 

unexpected type name 'FaultsBuilder3D': expected expression
}
} // namespace geode
21 changes: 3 additions & 18 deletions bindings/python/src/explicit/mixin/builder/horizons_builder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,26 +31,11 @@
pybind11::class_< HorizonsBuilder##dimension##D >( \
module, name##dimension.c_str() ) \
.def( "set_horizon_contact_type", \
static_cast< void ( HorizonsBuilder##dimension##D::* )( \
const Horizon##dimension##D&, \
Horizon##dimension##D::CONTACT_TYPE ) >( \
&HorizonsBuilder##dimension##D::set_horizon_contact_type ), \
&HorizonsBuilder##dimension##D::set_horizon_contact_type, \
pybind11::arg( "horizon" ), pybind11::arg( "contact_type" ) ) \
.def( "set_horizon_contact_type", \
static_cast< void ( HorizonsBuilder##dimension##D::* )( \
const uuid&, Horizon##dimension##D::CONTACT_TYPE ) >( \
&HorizonsBuilder##dimension##D::set_horizon_contact_type ), \
pybind11::arg( "horizon_id" ), pybind11::arg( "contact_type" ) ) \
.def( "set_horizon_name", \
static_cast< void ( HorizonsBuilder##dimension##D::* )( \
const Horizon##dimension##D&, std::string_view ) >( \
&HorizonsBuilder##dimension##D::set_horizon_name ), \
pybind11::arg( "horizon" ), pybind11::arg( "name" ) ) \
.def( "set_horizon_name", \
static_cast< void ( HorizonsBuilder##dimension##D::* )( \
const uuid&, std::string_view ) >( \
&HorizonsBuilder##dimension##D::set_horizon_name ), \
pybind11::arg( "horizon_id" ), pybind11::arg( "name" ) )
&HorizonsBuilder##dimension##D::set_horizon_name, \
pybind11::arg( "horizon" ), pybind11::arg( "name" ) )

namespace geode
{
Expand Down
15 changes: 3 additions & 12 deletions bindings/python/src/explicit/mixin/builder/stratigraphic_units_builder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,9 @@
pybind11::class_< StratigraphicUnitsBuilder##dimension##D >( \
module, name##dimension.c_str() ) \
.def( "set_stratigraphic_unit_name", \
static_cast< void ( StratigraphicUnitsBuilder##dimension##D::* )( \
const StratigraphicUnit##dimension##D&, std::string_view ) >( \
&StratigraphicUnitsBuilder##dimension##D:: \
set_stratigraphic_unit_name ), \
pybind11::arg( "stratigraphic_unit" ), pybind11::arg( "name" ) ) \
.def( "set_stratigraphic_unit_name", \
static_cast< void ( StratigraphicUnitsBuilder##dimension##D::* )( \
const uuid&, std::string_view ) >( \
&StratigraphicUnitsBuilder##dimension##D:: \
set_stratigraphic_unit_name ), \
pybind11::arg( "stratigraphic_unit_id" ), \
pybind11::arg( "name" ) )
&StratigraphicUnitsBuilder##dimension##D:: \
set_stratigraphic_unit_name, \
pybind11::arg( "stratigraphic_unit" ), pybind11::arg( "name" ) )

namespace geode
{
Expand Down
40 changes: 19 additions & 21 deletions bindings/python/tests/explicit/test-py-structural-model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,32 +247,30 @@ def test_typed_creation():
raise ValueError("[Test] Horizon should be created with its contact type")


def test_setters_with_uuid():
def test_setters_with_keywords():
model = geosciences.StructuralModel()
builder = geosciences.StructuralModelBuilder(model)
horizon = builder.add_horizon()
builder.set_horizon_name(horizon, "H")
horizon = model.horizon(builder.add_horizon())
builder.set_horizon_name(horizon=horizon, name="H")
builder.set_horizon_contact_type(
horizon, geosciences.Horizon3D.CONTACT_TYPE.EROSION
horizon=horizon, contact_type=geosciences.Horizon3D.CONTACT_TYPE.EROSION
)
fault = builder.add_fault()
builder.set_fault_name(fault, "F")
builder.set_fault_type(fault, geosciences.Fault3D.FAULT_TYPE.REVERSE)
unit = builder.add_stratigraphic_unit()
builder.set_stratigraphic_unit_name(unit, "U")
fault_block = builder.add_fault_block()
builder.set_fault_block_name(fault_block, "FB")
builder.set_fault_name(fault=model.fault(fault), name="F")
fault = model.fault(builder.add_fault())
builder.set_fault_name(fault=fault, name="F")
builder.set_fault_type(fault=fault, type=geosciences.Fault3D.FAULT_TYPE.REVERSE)
unit = model.stratigraphic_unit(builder.add_stratigraphic_unit())
builder.set_stratigraphic_unit_name(stratigraphic_unit=unit, name="U")
fault_block = model.fault_block(builder.add_fault_block())
builder.set_fault_block_name(fault_block=fault_block, name="FB")
if (
model.horizon(horizon).name() != "H"
or model.horizon(horizon).contact_type()
!= geosciences.Horizon3D.CONTACT_TYPE.EROSION
or model.fault(fault).name() != "F"
or model.fault(fault).type() != geosciences.Fault3D.FAULT_TYPE.REVERSE
or model.stratigraphic_unit(unit).name() != "U"
or model.fault_block(fault_block).name() != "FB"
horizon.name() != "H"
or horizon.contact_type() != geosciences.Horizon3D.CONTACT_TYPE.EROSION
or fault.name() != "F"
or fault.type() != geosciences.Fault3D.FAULT_TYPE.REVERSE
or unit.name() != "U"
or fault_block.name() != "FB"
):
raise ValueError("[Test] Setters with uuid should modify the model")
raise ValueError("[Test] Setters with keyword arguments should modify the model")


if __name__ == "__main__":
Expand All @@ -287,4 +285,4 @@ def test_setters_with_uuid():
test_copy(model)
modify_model(model, builder)
test_typed_creation()
test_setters_with_uuid()
test_setters_with_keywords()
3 changes: 0 additions & 3 deletions include/geode/geosciences/explicit/mixin/builder/fault_blocks_builder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ namespace geode
void set_fault_block_name(
const FaultBlock< dimension >& fault_block, std::string_view name );

void set_fault_block_name(
const uuid& fault_block_id, std::string_view name );

protected:
explicit FaultBlocksBuilder( FaultBlocks< dimension >& fault_blocks )
: fault_blocks_( fault_blocks )
Expand Down
5 changes: 0 additions & 5 deletions include/geode/geosciences/explicit/mixin/builder/faults_builder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@ namespace geode
void set_fault_name(
const Fault< dimension >& fault, std::string_view name );

void set_fault_type( const uuid& fault_id,
typename Fault< dimension >::FAULT_TYPE type );

void set_fault_name( const uuid& fault_id, std::string_view name );

protected:
explicit FaultsBuilder( Faults< dimension >& faults )
: faults_( faults )
Expand Down
5 changes: 0 additions & 5 deletions include/geode/geosciences/explicit/mixin/builder/horizons_builder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,6 @@ namespace geode
void set_horizon_name(
const Horizon< dimension >& horizon, std::string_view name );

void set_horizon_contact_type(
const uuid& horizon_id, CONTACT_TYPE contact_type );

void set_horizon_name( const uuid& horizon_id, std::string_view name );

protected:
explicit HorizonsBuilder( Horizons< dimension >& horizons )
: horizons_( horizons )
Expand Down
3 changes: 0 additions & 3 deletions include/geode/geosciences/explicit/mixin/builder/stratigraphic_units_builder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ namespace geode
const StratigraphicUnit< dimension >& stratigraphic_unit,
std::string_view name );

void set_stratigraphic_unit_name(
const uuid& stratigraphic_unit_id, std::string_view name );

protected:
explicit StratigraphicUnitsBuilder(
StratigraphicUnits< dimension >& stratigraphic_units )
Expand Down
8 changes: 0 additions & 8 deletions src/geode/geosciences/explicit/mixin/builder/fault_blocks_builder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,6 @@ namespace geode
typename FaultBlock< dimension >::FaultBlocksBuilderKey{} );
}

template < index_t dimension >
void FaultBlocksBuilder< dimension >::set_fault_block_name(
const uuid& fault_block_id, std::string_view name )
{
set_fault_block_name(
fault_blocks_.fault_block( fault_block_id ), name );
}

template class opengeode_geosciences_explicit_api FaultBlocksBuilder< 2 >;
template class opengeode_geosciences_explicit_api FaultBlocksBuilder< 3 >;
} // namespace geode
14 changes: 0 additions & 14 deletions src/geode/geosciences/explicit/mixin/builder/faults_builder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,20 +95,6 @@ namespace geode
name, typename Fault< dimension >::FaultsBuilderKey{} );
}

template < index_t dimension >
void FaultsBuilder< dimension >::set_fault_type(
const uuid& fault_id, typename Fault< dimension >::FAULT_TYPE type )
{
set_fault_type( faults_.fault( fault_id ), type );
}

template < index_t dimension >
void FaultsBuilder< dimension >::set_fault_name(
const uuid& fault_id, std::string_view name )
{
set_fault_name( faults_.fault( fault_id ), name );
}

template class opengeode_geosciences_explicit_api FaultsBuilder< 2 >;
template class opengeode_geosciences_explicit_api FaultsBuilder< 3 >;
} // namespace geode
15 changes: 0 additions & 15 deletions src/geode/geosciences/explicit/mixin/builder/horizons_builder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,21 +96,6 @@ namespace geode
name, typename Horizon< dimension >::HorizonsBuilderKey{} );
}

template < index_t dimension >
void HorizonsBuilder< dimension >::set_horizon_contact_type(
const uuid& horizon_id, CONTACT_TYPE contact_type )
{
set_horizon_contact_type(
horizons_.horizon( horizon_id ), contact_type );
}

template < index_t dimension >
void HorizonsBuilder< dimension >::set_horizon_name(
const uuid& horizon_id, std::string_view name )
{
set_horizon_name( horizons_.horizon( horizon_id ), name );
}

template class opengeode_geosciences_explicit_api HorizonsBuilder< 2 >;
template class opengeode_geosciences_explicit_api HorizonsBuilder< 3 >;
} // namespace geode
9 changes: 0 additions & 9 deletions src/geode/geosciences/explicit/mixin/builder/stratigraphic_units_builder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,6 @@ namespace geode
dimension >::StratigraphicUnitsBuilderKey{} );
}

template < index_t dimension >
void StratigraphicUnitsBuilder< dimension >::set_stratigraphic_unit_name(
const uuid& stratigraphic_unit_id, std::string_view name )
{
set_stratigraphic_unit_name(
stratigraphic_units_.stratigraphic_unit( stratigraphic_unit_id ),
name );
}

template class opengeode_geosciences_explicit_api
StratigraphicUnitsBuilder< 2 >;
template class opengeode_geosciences_explicit_api
Expand Down
Loading