fix optimize bracket depth bug (#2490)

Author: sneaxiy

python/sqlflow_submitter/optimize/model_generation_test.py

@@ -69,7 +69,24 @@ def setUp(self):
 
         self.variables = ["product"]
 
-    def test_main(self):
+    def test_multiple_brackets(self):
+        constraint = {
+            "expression": [
+                'SUM', '(', 'finishing', '*', 'product', '+', 'SUM', '(',
+                'product', ')', ')', '<=', '100'
+            ]
+        }
+        c0 = self.generate_constraint_func(constraint,
+                                           result_value_name='product')
+        c1 = self.generate_constraint_func(constraint,
+                                           result_value_name="product_value")
+        self.assertEqual(get_source(c0), get_source(c1))
+        self.assertEqual(
+            get_source(c0),
+            "sum([DATA_FRAME.finishing[i_0]*model.x[i_0]+sum([model.x[i_1] for i_1 in model.x]) for i_0 in model.x])<=100"
+        )
+
+    def test_model_generation(self):
         objective = [
             'SUM', '(', '(', 'price', '-', 'materials_cost', '-', 'other_cost',
             ')', '*', 'product', ')'

python/sqlflow_submitter/optimize/optimize.py

@@ -197,7 +197,7 @@ def get_depth(idx):
                 if idx < l or idx > r:
                     continue
 
-                if max_depth_idx < 0 or bracket_indices[max_depth_idx] < d:
+                if max_depth_idx < 0 or bracket_indices[max_depth_idx][2] < d:
                     max_depth_idx = k
 
                 k += 1