Skip to content

Commit c9d16e9

Browse files
committed
fix: disable inequality data
1 parent 8bb63bb commit c9d16e9

File tree

2 files changed

+23
-24
lines changed

2 files changed

+23
-24
lines changed

LoopStructural/modelling/features/_geological_feature.py

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,8 @@ def get_data(self, value_map: Optional[dict] = None) -> List[Union[ValuePoints,
283283
value_constraints = self.builder.get_value_constraints()
284284
gradient_constraints = self.builder.get_gradient_constraints()
285285
norm_constraints = self.builder.get_norm_constraints()
286-
inequality_pair_constraints = self.builder.get_inequality_pair_constraints()
287-
inequality_constraints = self.builder.get_inequality_constraints()
286+
# inequality_pair_constraints = self.builder.get_inequality_pair_constraints()
287+
# inequality_constraints = self.builder.get_inequality_constraints()
288288
data = []
289289
if gradient_constraints.shape[0] > 0:
290290

@@ -323,18 +323,17 @@ def get_data(self, value_map: Optional[dict] = None) -> List[Union[ValuePoints,
323323
name=f"{self.name}_value",
324324
)
325325
)
326-
if inequality_constraints.shape[0] > 0:
327-
328-
data.append(
329-
ValuePoints(
330-
locations=self.model.rescale(
331-
inequality_constraints[:, :3]
332-
),
333-
values=value_constraints[:, 3],
334-
name=f"{name}_inequality",
335-
properties = {'l':inequality_constraints[:,3],'u':inequality_constraints[:,4]}
336-
337-
)
338-
)
339-
# if inequality_pair_constraints.shape[0]
326+
# if inequality_constraints.shape[0] > 0:
327+
328+
# data.append(
329+
# ValuePoints(
330+
# locations=self.model.rescale(
331+
# inequality_constraints[:, :3]
332+
# ),
333+
# values=value_constraints[:, 3],
334+
# name=f"{name}_inequality",
335+
# properties = {'l':inequality_constraints[:,3],'u':inequality_constraints[:,4]}
336+
337+
# )
338+
# )
340339
return data

LoopStructural/modelling/features/builders/_geological_feature_builder.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -419,14 +419,14 @@ def get_interface_constraints(self):
419419
)
420420
else:
421421
return np.zeros((0, 5))
422-
def get_inequality_pair_constraints(self):
423-
mask = np.all(~np.isnan(self.data.loc[:,pairs_name()].to_numpy(float())),axis=1)
424-
if mask.shape[0] > 0:
425-
return self.data.loc[mask, xyz_names() + pairs_name()+weight_name()].to_numpy(float)
426-
def get_inequality_constraints(self):
427-
mask = np.all(~np.isnan(self.data.loc[:,inequality_name()].to_numpy(float())),axis=1)
428-
if mask.shape[0] > 0:
429-
return self.data.loc[mask, xyz_names() + inequality_name()+weight_name()].to_numpy(float)
422+
# def get_inequality_pair_constraints(self):
423+
# mask = np.all(~np.isnan(self.data.loc[:,pairs_name()].to_numpy(float())),axis=1)
424+
# if mask.shape[0] > 0:
425+
# return self.data.loc[mask, xyz_names() + pairs_name()+weight_name()].to_numpy(float)
426+
# def get_inequality_constraints(self):
427+
# mask = np.all(~np.isnan(self.data.loc[:,inequality_name()].to_numpy(float())),axis=1)
428+
# if mask.shape[0] > 0:
429+
# return self.data.loc[mask, xyz_names() + inequality_name()+weight_name()].to_numpy(float)
430430
def get_data_locations(self):
431431
"""
432432
Get only the location for all data points

0 commit comments

Comments
 (0)