Code

NL Formulation#34

Code

Open

k8culver wants to merge 56 commits intodwave-examples:maindwave-examples/employee-scheduling:mainfrom k8culver:feature/nl-formulationk8culver/employee-scheduling:feature/nl-formulationCopy head branch name to clipboard

+799-144

Commits

Commits on Jul 4, 2024

• add nl formulation function stubs

  jlalbers

  committed
  88ebe91

  Copy full SHA for 88ebe91

Commits on Jul 5, 2024

• move multiprocess import to top of file

  jlalbers

  committed
  fae8bb1

  Copy full SHA for fae8bb1

Commits on Sep 6, 2024

• Functional nl formulation

  jlalbers

  committed
  f20dbf3

  Copy full SHA for f20dbf3

Commits on Sep 11, 2024

• Move sampling to __main__

  jlalbers

  committed
  c7a7a66

  Copy full SHA for c7a7a66

Commits on Sep 13, 2024

• add build_nl() function

  jlalbers

  committed
  dbaa866

  Copy full SHA for dbaa866

• require dwave-optimization 0.3.0 for scalar broadcasting

  jlalbers

  committed
  1307b74

  Copy full SHA for 1307b74

• add nl model validation function to utils.py

  jlalbers

  committed
  73e8fdc

  Copy full SHA for 73e8fdc

• refactor msgs to module constant

  jlalbers

  committed
  680f8bb

  Copy full SHA for 680f8bb

• add ModelParams dataclass

  jlalbers

  committed
  63595ad

  Copy full SHA for 63595ad

• refactor build_nl to use ModelParams

  jlalbers

  committed
  a65c2f6

  Copy full SHA for a65c2f6

• move ModelParams to utils

  jlalbers

  committed
  513c815

  Copy full SHA for 513c815

• update validation functions to use ModelParams

  jlalbers

  committed
  aff21f3

  Copy full SHA for aff21f3

• remove unused import

  jlalbers

  committed
  99d1abe

  Copy full SHA for 99d1abe

• add time limit heuristic for run_nl

  jlalbers

  committed
  6a3c9e0

  Copy full SHA for 6a3c9e0

Commits on Sep 17, 2024

• update manager constraint to equality instead of geq

  jlalbers

  committed
  db02c64

  Copy full SHA for db02c64

• add build_schedule_from_state function

  jlalbers

  committed
  ec1839b

  Copy full SHA for ec1839b

• fix FutureWarning in build_random_sched function

  jlalbers

  committed
  caed39d

  Copy full SHA for caed39d

• change parameter from BinaryVariable to state ndarray

  jlalbers

  committed
  e3284b0

  Copy full SHA for e3284b0

• add unit tests for NL formulation

  jlalbers

  committed
  11075f1

  Copy full SHA for 11075f1

• add solver options to app_configs.py

  jlalbers

  committed
  19161de

  Copy full SHA for 19161de

• add solver selection dropdown to control card

  jlalbers

  committed
  3e55fc8

  Copy full SHA for 3e55fc8

• fix max_consecutive_shifts constraint in cqm formulation so that the actual constraint value can be passed directly from app.py

  jlalbers

  committed
  2ba145a

  Copy full SHA for 2ba145a

Commits on Sep 18, 2024

• fix Solver dropdown value initialization

  jlalbers

  committed
  86e1ec5

  Copy full SHA for 86e1ec5

• add NL solver to run_optimization callback

  jlalbers

  committed
  105dd9a

  Copy full SHA for 105dd9a

• fix error message string

  jlalbers

  committed
  26d5407

  Copy full SHA for 26d5407

• add .venv to gitignore

  jlalbers

  committed
  bba4021

  Copy full SHA for bba4021

• delete nl_formulation.py development file

  jlalbers

  committed
  d1f4bb6

  Copy full SHA for d1f4bb6

• fix shift label bug with NL error msgs

  jlalbers

  committed
  8d47156

  Copy full SHA for 8d47156

• remove time limit heuristic

  jlalbers

  committed
  3a19e58

  Copy full SHA for 3a19e58

• create SolverType enum

  jlalbers

  committed
  3a80f5f

  Copy full SHA for 3a80f5f

• remove SOLVERS option from app_configs

  jlalbers

  committed
  801eb22

  Copy full SHA for 801eb22

• add dropdown function to app_html

  jlalbers

  committed
  8950790

  Copy full SHA for 8950790

• refactor solver dropdown to use dropdown function

  jlalbers

  committed
  79b8610

  Copy full SHA for 79b8610

• refactor presets dropdown to use dropdown function

  jlalbers

  committed
  cb3e2e3

  Copy full SHA for cb3e2e3

• change SolverType.NL label

  jlalbers

  committed
  3ad7d4f

  Copy full SHA for 3ad7d4f

• use SolverType in app.py

  jlalbers

  committed
  4178948

  Copy full SHA for 4178948

• fix typo in utils.py

  Show description for 40a571e
  

  jlalbers

  and

  k8culver

  authored
  40a571e

  Copy full SHA for 40a571e

• remove print debug statement in employee_scheduling.py

  Show description for ca13584
  

  jlalbers

  and

  k8culver

  authored
  ca13584

  Copy full SHA for ca13584

• refactor key/value assignments out of loop in utils.py

  Show description for 2d1893a
  

  jlalbers

  and

  k8culver

  authored
  2d1893a

  Copy full SHA for 2d1893a

• use MSGS global variable direclty in run_cqm

  jlalbers

  committed
  0f5edb6

  Copy full SHA for 0f5edb6

• fix bug accessing SolverType.label

  jlalbers

  committed
  6475aa2

  Copy full SHA for 6475aa2

• refactor consecutive shift arrays to variable

  jlalbers

  committed
  c9483d5

  Copy full SHA for c9483d5

Commits on Sep 20, 2024

• change '==' comparison to 'is' for readability in app.py

  Show description for a5c2146
  

  jlalbers

  and

  k8culver

  authored
  a5c2146

  Copy full SHA for a5c2146

• Update employee_scheduling.py

  Show description for 623d033
  

  jlalbers

  and

  arcondello

  authored
  623d033

  Copy full SHA for 623d033

• edit implementation of ModelParams and nl validation functions

  jlalbers

  committed
  2eb1a79

  Copy full SHA for 2eb1a79

• refactor functions to use individual parameters instead of ModelParams

  jlalbers

  committed
  5af20b6

  Copy full SHA for 5af20b6

• unpack params into function arguments

  jlalbers

  committed
  7536567

  Copy full SHA for 7536567

• add comment to clarify changing of assignment value from 2 to 100 in build_nl

  jlalbers

  committed
  1a024bc

  Copy full SHA for 1a024bc

• update tests to use asdict with ModelParams

  jlalbers

  committed
  95aeacd

  Copy full SHA for 95aeacd

Commits on Dec 20, 2024

• Resolve merge conflicts

  k8culver

  committed
  482f3ca

  Copy full SHA for 482f3ca

Commits on Dec 24, 2024

• Add new constraints to NL formulation, fix bugs

  k8culver

  committed
  d8e2cbd

  Copy full SHA for d8e2cbd

• Move NL option to configs

  k8culver

  committed
  149773d

  Copy full SHA for 149773d

• Run black and isort

  k8culver

  committed
  65fd5fa

  Copy full SHA for 65fd5fa

• Fix tests

  k8culver

  committed
  df98e7c

  Copy full SHA for df98e7c

• Update circleci config

  k8culver

  committed
  4eab876

  Copy full SHA for 4eab876

Commits on Jan 16, 2025

• Fix objective, remove preferred shift modifier

  k8culver

  committed
  be4ba04

  Copy full SHA for be4ba04