Code

Data Structure Refactor#43

Code

Closed

pulsipher wants to merge 133 commits intohdavid16:masterhdavid16/DisjunctiveProgramming.jl:masterfrom pulsipher:structure_overallpulsipher/DisjunctiveProgramming.jl:structure_overallCopy head branch name to clipboard

+5,637-17,006

Commits

Commits on May 13, 2022

• Initial commit

  pulsipher

  committed
  268a4ab

Commits on Jun 12, 2022

• Add logical vars and propositions.

  pulsipher

  committed
  fd87c2f

Commits on Jun 15, 2022

• More progress

  pulsipher

  committed
  0ffa3b4

Commits on Aug 31, 2022

• Update src-old

  pulsipher

  committed
  e61b531

Commits on May 3, 2023

• fix some bugs preventing package from loading

  Show description for 46ae36a
  hdavid16

  committed
  46ae36a

• bug fixes

  hdavid16

  committed
  93b6d3e

• add methods for disjunctive constraints

  hdavid16

  committed
  c826cef

Commits on May 5, 2023

• add bigM and hull reformulations

  hdavid16

  committed
  9919908

Commits on May 11, 2023

• add default BigM; add general GDPData method

  hdavid16

  committed
  9943654

• extend copy_extension_data

  hdavid16

  committed
  708a8cb

• update example

  hdavid16

  committed
  372785b

• up version; remove deps

  hdavid16

  committed
  4062f72

• update example 1

  hdavid16

  committed
  0d61cdd

• remove bounds on binary indicator vars

  hdavid16

  committed
  5ddb008

• extend methods for LogicVariableRef

  hdavid16

  committed
  1f594eb

• change LogicalIndex to LogicalVariableIndex

  Show description for 96af35f
  hdavid16

  committed
  96af35f

• extend getindex to allow copying GDPModel

  hdavid16

  committed
  a33702c

• update ex1 and ex2

  hdavid16

  committed
  6352ed7

Commits on May 12, 2023

• copy_extension_data needs more work

  hdavid16

  committed
  fa53c52

Commits on Jul 11, 2023

• update based on review

  hdavid16

  committed
  3b8938a

• use Sets instead of Vectors for querying variables

  hdavid16

  committed
  6952e33

• replace push! with union!

  hdavid16

  committed
  bb2ec4a

• improve performance for Hull

  hdavid16

  committed
  d528472

• clean code

  hdavid16

  committed
  44f08ea

Commits on Jul 12, 2023

• close hdavid16#64; add epsilon value for Hull

  hdavid16

  committed
  0d1866f

• update fallbacks for quadexpr

  hdavid16

  committed
  a5451de

Commits on Jul 13, 2023

• implement copy_extension_data

  hdavid16

  committed
  4e926df

Commits on Jul 18, 2023

• add big-m support for NLP; fix bugs

  hdavid16

  committed
  929413c

• first pass on hull reform for nlp

  hdavid16

  committed
  4f901d9

• first pass on nlp hull reform

  hdavid16

  committed
  8ff3e83

Commits on Jul 19, 2023

• hull reformulation for nonlinear models added

  hdavid16

  committed
  e6e12dd

• update ex2

  hdavid16

  committed
  d41aaee

• add selector logical constrain reformulations

  hdavid16

  committed
  17d124b

• add CNF functions

  hdavid16

  committed
  3ebf603

Commits on Jul 20, 2023

• update logic transformation; add _flatten

  hdavid16

  committed
  82c0397

• fix distribute AND over OR

  hdavid16

  committed
  a4e1e49

• remove usage of @constraint macro

  hdavid16

  committed
  42121fd

• remove JuMP macros; add reformulate proposition

  hdavid16

  committed
  25d700f

• wrapper for VariableInfo

  hdavid16

  committed
  f58a242

• update ex4

  hdavid16

  committed
  5fa4f93

• complete proposition transformation functions

  hdavid16

  committed
  da2fef5

• define and use logical operators to build LogicExpr

  hdavid16

  committed
  d0c5ddd

Commits on Aug 1, 2023

• first implementation using @constraint macro for disjunct constraints and logic constraints

  hdavid16

  committed
  7f44c7f

• use parse_constraint_call for logical constraints

  hdavid16

  committed
  2781545

• clean

  hdavid16

  committed
  4e7edcd

• use func in set for logical constraints

  hdavid16

  committed
  0f29b5f

• allow creating a constraint with exactly, atleast, atmost functions and parse to func in set notation

  hdavid16

  committed
  6eef5d4

• clean up

  hdavid16

  committed
  f88e2b2

• bug fix to allow CP set to have a LogicalVariableRef

  hdavid16

  committed
  73d759b

• organize and add section titles

  hdavid16

  committed
  f9a730d

• .

  hdavid16

  committed
  5f93854

Commits on Aug 3, 2023

• Refactor frontend

  pulsipher

  committed
  9cd3a67

• Fix bugs

  pulsipher

  committed
  a967d35

Commits on Aug 7, 2023

• first pass at adding reformulations and copy to new structure

  hdavid16

  committed
  82aa16c

Commits on Aug 8, 2023

• 2nd pass: fix bugs. add parse methods for logical operators

  hdavid16

  committed
  36da978

• fix copy warning

  hdavid16

  committed
  74ed9b8

• remove --> from logic operators since clashes with indicator constraints

  hdavid16

  committed
  e4d5a83

• add dispatch methods for non Bool sets in build_constraint

  hdavid16

  committed
  eadaa2e

• use _error instead of error

  hdavid16

  committed
  caeb39b

Commits on Aug 13, 2023

• update to fix bugs

  hdavid16

  committed
  47bed8a

Commits on Aug 16, 2023

• minor edits

  hdavid16

  committed
  37243b5

Commits on Sep 6, 2023

• extend operator_to_set. update allowed unicode logical ops

  hdavid16

  committed
  5b973e7

Commits on Sep 7, 2023

• Update JuMP nlp and clean it

  pulsipher

  committed
  ff8db85

Commits on Sep 8, 2023

• update selector reformulation to use @expression

  hdavid16

  committed
  b92d812

• pass fix and start values from logical to bin vars

  hdavid16

  committed
  2dbc184

• update NonlinearOperator arg order; clean up

  hdavid16

  committed
  b4ac164

Commits on Sep 11, 2023

• extend BigM for VectorConstraints

  hdavid16

  committed
  7df62f8

• use @expression for all reformulations; bug fixes; improve code

  hdavid16

  committed
  f4ae4b9

• extend hull reform to vectorconstraints; cleanup

  hdavid16

  committed
  db5d95a

Commits on Sep 12, 2023

• refactor to simplify objects stored in gdpdata

  Show description for d7adb3a
  hdavid16

  committed
  d7adb3a

• extend JuMP.delete for GDP constraints and vars

  hdavid16

  committed
  e57b7e4

• address TODOs

  hdavid16

  committed
  bc77455

Commits on Sep 13, 2023

• support vector constraints for disjunctconstraint

  hdavid16

  committed
  107ac0d

• update optimize_hook

  hdavid16

  committed
  aa47a1c

• delete reformulated constraints and vars from previous optimize call

  hdavid16

  committed
  ee9ff23

• add method; bug fix

  hdavid16

  committed
  7489b56

• expose function for reformulating a model

  hdavid16

  committed
  6a6c2e8

• support indicator reformulation with vector constraints and nonlinear constraints

  hdavid16

  committed
  7fb4540

• fix bugs by running Aqua and JET

  hdavid16

  committed
  1f2296f

Commits on Sep 14, 2023

• use MA.add_mul!! for nonlinear expr

  hdavid16

  committed
  c0f0317

Commits on Sep 15, 2023

• review and cleanup codebase

  hdavid16

  committed
  38d919c

• add tests for logical vars; fix bugs

  hdavid16

  committed
  1402750

• add lvar tests

  hdavid16

  committed
  98665e5

Commits on Sep 16, 2023

• make suggested changes; fix bug

  hdavid16

  committed
  005d735

• review items

  hdavid16

  committed
  a84531a

Commits on Sep 18, 2023

• address review

  hdavid16

  committed
  6989f24

Commits on Sep 19, 2023

• add nested disjunction reformulations:

  Show description for b61f701
  hdavid16

  committed
  b61f701

Commits on Sep 20, 2023

• fix bug for multi-level nesting

  hdavid16

  committed
  abaad04

• bug fix for nested indicator reformulation

  hdavid16

  committed
  72cd989

• clean nested indicator reformulation

  hdavid16

  committed
  4fb7e3d

• remove copy methods

  hdavid16

  committed
  a416bc5

• improve nested disjunction code

  hdavid16

  committed
  8ec0573

• replace indices with refs

  hdavid16

  committed
  639da3e

Commits on Sep 21, 2023

• Update src/constraints.jl

  Show description for 6a8c6ec
  

  hdavid16

  and

  pulsipher

  authored
  6a8c6ec

• Update src/constraints.jl

  Show description for 94f832b
  

  hdavid16

  and

  pulsipher

  authored
  94f832b

• Update src/reformulate.jl

  Show description for 27b95c9
  

  hdavid16

  and

  pulsipher

  authored
  27b95c9

• remove files that shouldn't be git tracked

  pulsipher

  committed
  e349c4b

• Update src/indicator.jl

  Show description for 2782434
  

  hdavid16

  and

  pulsipher

  authored
  2782434

• append instead of push

  hdavid16

  committed
  07febb5

• Merge branch 'structure_overall' of https://github.com/pulsipher/DisjunctiveProgramming.jl into structure_overall

  hdavid16

  committed
  a1c4945

• bug fix

  hdavid16

  committed
  1396b65

• add some tests

  hdavid16

  committed
  03c456b

• check only continuous vars used in disj constr

  hdavid16

  committed
  9aa317a

Commits on Sep 22, 2023

• Update reformulate.jl

  Show description for b999c1d
  

  hdavid16

  and

  pulsipher

  authored
  b999c1d

• add tests; fix bugs

  hdavid16

  committed
  8df0ecd

• add solve example tests

  hdavid16

  committed
  5667bae

• fix MOI sets for selectors

  hdavid16

  committed
  7e839fb

• Update Project.toml

  Show description for 98fc3b2
  

  hdavid16

  and

  pulsipher

  authored
  98fc3b2

Commits on Sep 27, 2023

• update tests

  hdavid16

  committed
  e180d75

• Merge branch 'structure_overall' of https://github.com/pulsipher/DisjunctiveProgramming.jl into structure_overall

  hdavid16

  committed
  39cc9ab

Commits on Sep 28, 2023

• IsTrue() for propositions; add tests

  hdavid16

  committed
  6aea798

• add some logic constraint tests

  hdavid16

  committed
  1a45fc3

• update tests

  hdavid16

  committed
  2714a96

Commits on Sep 29, 2023

• add test for disjunctions

  hdavid16

  committed
  b5a69b4

Commits on Sep 30, 2023

• Fix disjunction macro logic

  pulsipher

  committed
  a6d34a4

• add todo

  pulsipher

  committed
  b5b0c59

Commits on Oct 1, 2023

• disjunct tests

  hdavid16

  committed
  8bf32e1

• Merge branch 'structure_overall' of https://github.com/pulsipher/DisjunctiveProgramming.jl into structure_overall

  hdavid16

  committed
  a20000f

• generalize disjunction for containers of logicalvariablerefs

  hdavid16

  committed
  02af76a

Commits on Oct 2, 2023

• fix macro

  pulsipher

  committed
  5ad2d2e

• clean up comments

  pulsipher

  committed
  de14932

• Clean up and simply macro

  pulsipher

  committed
  040fc15

• minor fix

  pulsipher

  committed
  9c76df9

Commits on Oct 3, 2023

• add tests

  hdavid16

  committed
  5039970

• Merge branch 'structure_overall' of https://github.com/pulsipher/DisjunctiveProgramming.jl into structure_overall

  hdavid16

  committed
  8bb78ac

Commits on Oct 9, 2023

• get variable bounds up front for BigM and store

  Show description for 762a877
  hdavid16

  committed
  762a877

• add methods

  hdavid16

  committed
  1b25f10

• add tests

  hdavid16

  committed
  50ca71a

Commits on Oct 10, 2023

• support empty disjuncts

  hdavid16

  committed
  4136a4a

• update readme and ex2

  hdavid16

  committed
  ad5c87c

• add release note

  hdavid16

  committed
  3a5957b

• Update logic heads to be consistent with JuMP

  pulsipher

  committed
  bc2a3bc

Commits on Oct 11, 2023

• fix bugs/tests

  hdavid16

  committed
  d501c77