Create redundant_facet_removal_backup.py #81

nitishmalang · 2023-10-04T17:36:53Z

pull request

TolisChal · 2023-10-04T17:48:19Z

dingo/backup/redundant_facet_removal_backup.py

+                            model_iter = solve_lp_with_different_objectives(
+                                model_iter, objective_function
+                            )


plz change this to:
model_iter = solve_lp_with_different_objectives(
model_iter.copy(), objective_function
)

TolisChal · 2023-10-04T17:49:16Z

dingo/backup/redundant_facet_removal_backup.py

+                            model_iter = solve_lp_with_different_objectives(
+                                model_iter, objective_function
+                            )


similar to the previous call

TolisChal · 2023-10-04T18:25:56Z

Thanks @nitishmalang! I'm ok with merging. Let's wait for a second review (@vissarion ?)

nitishmalang · 2023-10-04T18:26:54Z

ok thanks

TolisChal · 2023-10-05T16:12:18Z

dingo/backup/redundant_facet_removal_backup.py

+import math
+
+
+def fast_fba(lb, ub, S, c):


Could you plz remove fast_fba() and fast_fva() from this file since they are irrelevant?

nitishmalang

done

TolisChal · 2023-10-05T16:27:38Z

dingo/backup/redundant_facet_removal_backup.py

+
+                        # Call solve_lp_with_different_objectives to solve LP
+                        model_iter = solve_lp_with_different_objectives(
+                            model_iter, objective_function_max


This has to be:
model_iter = solve_lp_with_different_objectives(
model_iter.copy(), objective_function_max
)

Plz change this wherever it has

nitishmalang

did it

TolisChal · 2023-10-05T16:37:09Z

dingo/backup/redundant_facet_removal_backup.py

+
+
+
+def fast_inner_ball(A, b):


Could you plz also remove the function fast_inner_ball() from this file?

nitishmalang

.

vissarion

Thanks @nitishmalang! I am in general OK with merging this code.

I have a few comments that could be integrated in the code. Please insert them as comments if you agree.

Also I propose to use a different name for the directory than backup. Maybe experimental_gurobi_functions and remove the term backup from all file names. This is not a backup it is the opposite it is something new, but experimental, that is why we are not integrating directly into the codebase, but it has to be tested.

vissarion · 2023-10-06T08:54:38Z

dingo/backup/redundant_facet_removal_backup.py

+
+    return model
+
+def fast_remove_redundant_facets(lb, ub, S, c, opt_percentage=100):


This is to replace fast_remove_redundant_facets in https://github.com/GeomScale/dingo/blob/develop/dingo/gurobi_based_implementations.py#L312C4-L312C4

yes this one is to be replaced

vissarion · 2023-10-06T08:55:17Z

dingo/backup/redundant_facet_removal_backup.py

+
+
+
+def update_model(model, n, Aeq_sparse, beq, lb, ub, A_sparse, b, objective_function):


This is to replace update_model in https://github.com/GeomScale/dingo/blob/develop/dingo/gurobi_based_implementations.py#L277

No, this is to be deleted. @nitishmalang could you plz delete this function?

ok @TolisChal

vissarion · 2023-10-06T08:58:13Z

dingo/backup/redundant_facet_removal_backup.py

+                            ub_iter[i] = ub_iter[i] + 1
+
+                            # Call solve_lp_with_different_objectives to solve LP
+                            model_iter = solve_lp_with_different_objectives(


this is the main change here (and one call below) that replaces the update_model and optimize() calls.

This function can be used to change only the objective function of a model. So, this is to be used in the loop
for i in indices:

Inside this loop we have a certain set of constraints and we check for redundant facets.

vissarion · 2023-10-06T08:59:58Z

dingo/backup/update_gurobi_model_backup.py

+import numpy as np
+import scipy.sparse as sp
+
+def update_model_constraints_and_bounds(model, Aeq_sparse=None, beq=None, A_sparse=None, b=None,


I do not understand the purpose of this function. Is this to be called by fast_remove_redundant_facets or replace update_model in certain cases?

This function is to be used in the loop:
while removed > 0 or offset > 0:
and before starting the loop:
for i in indices:

When we remove a facet the set of constraints changes, so we have to update the model (change the matrices A,Aeq,b,beq and the bounds). Then, we have to run for i in indices: and go over all the active coordinates to check for new redundant facets.

…xperimental.py

TolisChal · 2023-10-06T16:48:08Z

dingo/backup/redundant_facet_removal_experimental.py

+
+
+
+def update_model(model, n, Aeq_sparse, beq, lb, ub, A_sparse, b, objective_function):


Could you plz delete this function since it is not needed here?

TolisChal · 2023-10-06T16:50:48Z

dingo/backup/redundant_facet_removal_experimental.py

+
+                    b_res = []
+                    A_res = np.empty((0, n), float)
+                    for i in indices:


Can you add a line before for i in indices: to update the model?
i.e.,
update_model_constraints_and_bounds(model_iter, Aeq_sparse, beq, A_sparse, [val], lb, ub)

Is this resolved indeed? I think this is not implemented yet.

TolisChal · 2023-10-06T17:01:37Z

dingo/experimental_gurobi_functions/redundant_facet_removal_experiment.py

+
+
+
+
+
+
+
+
+
+


Could you plz delete all these empty lines?

TolisChal · 2023-10-06T17:02:43Z

dingo/experimental_gurobi_functions/update_gurobi_model_experiment.py

+import numpy as np
+import scipy.sparse as sp
+
+def update_model_constraints_and_bounds(model, Aeq_sparse=None, beq=None, A_sparse=None, b=None,


Could you plz move this function into the file dingo/experimental_gurobi_functions/redundant_facet_removal_experiment.py and delete this file?

ok @TolisChal

…ment.py

nitishmalang

updated @TolisChal

TolisChal · 2023-10-06T20:20:48Z

dingo/experimental_gurobi_functions/redundant_facet_removal_experiment.py

+
+                    b_res = []
+                    A_res = np.empty((0, n), float)
+                  update_model_constraints_and_bounds(model_iter, Aeq_sparse, beq, A_sparse, [val], lb, ub)


plz fix the spaces in this line. That will give a runtime error

ok fixing this

nitishmalang

.

nitishmalang

updated

nitishmalang

indentation change is done

dingo/experimental_gurobi_functions/redundant_facet_removal_experiment.py

nitishmalang

.

nitishmalang

updated

Create redundant_facet_removal_backup.py

6fd6807

TolisChal reviewed Oct 4, 2023

View reviewed changes

Update redundant_facet_removal_backup.py

3234956

nitishmalang closed this Oct 4, 2023

nitishmalang reopened this Oct 4, 2023

nitishmalang requested a review from TolisChal October 4, 2023 18:15

TolisChal approved these changes Oct 4, 2023

View reviewed changes

Create update_gurobi_model_backup.py

f5a5061

nitishmalang requested a review from TolisChal October 4, 2023 18:46

TolisChal approved these changes Oct 4, 2023

View reviewed changes

TolisChal reviewed Oct 5, 2023

View reviewed changes

Update redundant_facet_removal_backup.py

3e85df2

nitishmalang commented Oct 5, 2023

View reviewed changes

nitishmalang requested a review from TolisChal October 5, 2023 16:24

TolisChal approved these changes Oct 5, 2023

View reviewed changes

TolisChal reviewed Oct 5, 2023

View reviewed changes

Update redundant_facet_removal_backup.py

256ef15

nitishmalang commented Oct 5, 2023

View reviewed changes

TolisChal reviewed Oct 5, 2023

View reviewed changes

nitishmalang requested a review from TolisChal October 5, 2023 16:44

Update redundant_facet_removal_backup.py

d2b8b1a

nitishmalang commented Oct 5, 2023

View reviewed changes

TolisChal approved these changes Oct 5, 2023

View reviewed changes

vissarion approved these changes Oct 6, 2023

View reviewed changes

Rename redundant_facet_removal_backup.py to redundant_facet_removal_e…

b79313c

…xperimental.py

TolisChal reviewed Oct 6, 2023

View reviewed changes

Delete dingo/backup directory

0c200a2

TolisChal reviewed Oct 6, 2023

View reviewed changes

Update redundant_facet_removal_experiment.py

19efaef

nitishmalang requested a review from TolisChal October 6, 2023 17:20

nitishmalang added 3 commits October 6, 2023 23:03

Update redundant_facet_removal_experiment.py

ed7a4c2

Delete dingo/experimental_gurobi_functions/update_gurobi_model_experi…

d8c0f3d

…ment.py

Update redundant_facet_removal_experiment.py

7254045

nitishmalang commented Oct 6, 2023

View reviewed changes

TolisChal reviewed Oct 6, 2023

View reviewed changes

Update redundant_facet_removal_experiment.py

018003f

nitishmalang commented Oct 6, 2023

View reviewed changes

nitishmalang added 2 commits October 7, 2023 02:04

Update redundant_facet_removal_experiment.py

6a76a91

Update redundant_facet_removal_experiment.py

4711ef4

nitishmalang commented Oct 6, 2023

View reviewed changes

nitishmalang added 2 commits October 7, 2023 02:17

Update redundant_facet_removal_experiment.py

f6a741f

Update redundant_facet_removal_experiment.py

8f9936d

nitishmalang commented Oct 6, 2023

View reviewed changes

TolisChal reviewed Oct 6, 2023

View reviewed changes

dingo/experimental_gurobi_functions/redundant_facet_removal_experiment.py Outdated Show resolved Hide resolved

Update redundant_facet_removal_experiment.py

a1ac13e

TolisChal approved these changes Oct 6, 2023

View reviewed changes

vissarion reviewed Oct 9, 2023

View reviewed changes

nitishmalang added 2 commits October 9, 2023 14:43

Update redundant_facet_removal_experiment.py

23c0652

Update redundant_facet_removal_experiment.py

144608d

nitishmalang commented Oct 9, 2023

View reviewed changes

Update redundant_facet_removal_experiment.py

7fa7b21

nitishmalang commented Oct 9, 2023

View reviewed changes

nitishmalang requested a review from vissarion October 9, 2023 10:33

TolisChal approved these changes Oct 11, 2023

View reviewed changes

TolisChal merged commit aaae4ae into GeomScale:develop Oct 11, 2023
1 check passed


		return model

		def fast_remove_redundant_facets(lb, ub, S, c, opt_percentage=100):




		def update_model(model, n, Aeq_sparse, beq, lb, ub, A_sparse, b, objective_function):

Create redundant_facet_removal_backup.py #81

Create redundant_facet_removal_backup.py #81

Conversation

nitishmalang commented Oct 4, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TolisChal commented Oct 4, 2023

nitishmalang commented Oct 4, 2023

Choose a reason for hiding this comment

nitishmalang left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nitishmalang left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nitishmalang left a comment

Choose a reason for hiding this comment

vissarion left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TolisChal Oct 6, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TolisChal Oct 6, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nitishmalang left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nitishmalang left a comment

Choose a reason for hiding this comment

nitishmalang left a comment

Choose a reason for hiding this comment

nitishmalang left a comment

Choose a reason for hiding this comment

nitishmalang left a comment

Choose a reason for hiding this comment

nitishmalang left a comment

Choose a reason for hiding this comment

nitishmalang commented Oct 4, 2023 •

edited

Loading

TolisChal Oct 6, 2023 •

edited

Loading

TolisChal Oct 6, 2023 •

edited

Loading