From 0b08aefab711382c00a57bf67e30eb62c37b62e3 Mon Sep 17 00:00:00 2001 From: Daniel Laky Date: Tue, 13 Aug 2024 13:22:19 -0400 Subject: [PATCH] Remove other user-defined model unique naming Added to TODO list in #3345 --- pyomo/contrib/doe/doe.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pyomo/contrib/doe/doe.py b/pyomo/contrib/doe/doe.py index 47992df71c0..005d9c0da52 100644 --- a/pyomo/contrib/doe/doe.py +++ b/pyomo/contrib/doe/doe.py @@ -433,10 +433,12 @@ def compute_FIM(self, model=None, method="sequential"): ).clone() model = self.compute_FIM_model else: - doe_block = pyo.Block() - doe_block_name = unique_component_name(model, "design_of_experiments_block") - model.add_component(doe_block_name, doe_block) - self.compute_FIM_model = model + # TODO: Add safe naming when a model is passed by the user. + # doe_block = pyo.Block() + # doe_block_name = unique_component_name(model, "design_of_experiments_block") + # model.add_component(doe_block_name, doe_block) + # self.compute_FIM_model = model + pass self.check_model_labels(model=model) @@ -731,9 +733,11 @@ def create_doe_model(self, model=None): if model is None: model = self.model else: - doe_block = pyo.Block() - doe_block_name = unique_component_name(model, "design_of_experiments_block") - model.add_component(doe_block_name, doe_block) + # TODO: Add safe naming when a model is passed by the user. + # doe_block = pyo.Block() + # doe_block_name = unique_component_name(model, "design_of_experiments_block") + # model.add_component(doe_block_name, doe_block) + pass # Developer recommendation: use the Cholesky decomposition for D-optimality # The explicit formula is available for benchmarking purposes and is NOT recommended