Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cvxpy/cvxpy
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: merraksh/cvxpy
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
2 contributors

Commits on Mar 28, 2017

  1. Introduced extra fields in XpressProblem

    Pietro Belotti committed Mar 28, 2017
    Copy the full SHA
    485239e View commit details

  2. add option for explicit QCQP formation

    Pietro Belotti committed Mar 28, 2017
    Copy the full SHA
    7957d4f View commit details

Commits on Mar 29, 2017

  1. adding IIS and name setting

    Pietro Belotti committed Mar 29, 2017
    Copy the full SHA
    de0a3bc View commit details

Commits on Apr 3, 2017

  1. pass IIS as dictionary rather than tuple; more meaningful (and hopefu… 

    …lly correct) name assignment to variables and constraints
    Pietro Belotti committed Apr 3, 2017
    Copy the full SHA
    d90e6d2 View commit details

Commits on Apr 4, 2017

  1. finished correspondence between original rows and transformed constra… 

    …ints. Same for variables and IIS
    Pietro Belotti committed Apr 4, 2017
    Copy the full SHA
    e5240b3 View commit details

  2. Added transferRow as explicit member of XpressProblem

    Pietro Belotti committed Apr 4, 2017
    Copy the full SHA
    91ee06c View commit details

Commits on Apr 6, 2017

  1. create transfRow in any case

    Pietro Belotti committed Apr 6, 2017
    Copy the full SHA
    ff42fb3 View commit details

Commits on Jul 27, 2017

  1. removed import math

    Pietro Belotti committed Jul 27, 2017
    Copy the full SHA
    ba5f8f2 View commit details

  2. Merge remote-tracking branch 'upstream/master' and fixing missing ref… 

    …erences to XPRESS
    Pietro Belotti committed Jul 27, 2017
    Copy the full SHA
    71c7cb1 View commit details

  3. Updating constants TROW, IIS to have an XPRESS_ prefix

    Pietro Belotti committed Jul 27, 2017
    Copy the full SHA
    6fce303 View commit details

Commits on Aug 3, 2017

  1. Add documentation, installation instructions, and examples for Xpress

    @merraksh
    merraksh committed Aug 3, 2017
    Copy the full SHA
    5f81d0b View commit details

  2. flake8 compliance

    @merraksh
    merraksh committed Aug 3, 2017
    Copy the full SHA
    a1d29b7 View commit details

Commits on Aug 8, 2017

  1. Remove import xpress from root of xpress_intf.py

    @merraksh
    merraksh committed Aug 8, 2017
    Copy the full SHA
    e3394df View commit details

  2. Import the xpress module in functions using its members

    @merraksh
    merraksh committed Aug 8, 2017
    Copy the full SHA
    f82a4af View commit details

  3. avoid importing xpress when defining the XPRESS class

    @merraksh
    merraksh committed Aug 8, 2017
    Copy the full SHA
    8c16c3e View commit details

  4. flake8 compliance

    @merraksh
    merraksh committed Aug 8, 2017
    Copy the full SHA
    e0b9498 View commit details

Commits on Nov 13, 2017

  1. more efficient cone generation (use addrows once rather than once for… 

    … every cone)
    @merraksh
    merraksh committed Nov 13, 2017
    Copy the full SHA
    8f7ca2d View commit details

  2. flake8 compliance

    @merraksh
    merraksh committed Nov 13, 2017
    Copy the full SHA
    9a3bd21 View commit details

Commits on Jun 13, 2019

  1. merged to current HEAD of cvxpy, resolved conflicts

    @merraksh
    merraksh committed Jun 13, 2019
    Copy the full SHA
    01e129a View commit details

Commits on Jun 20, 2019

  1. Merge remote-tracking branch 'upstream/master'

    @merraksh
    merraksh committed Jun 20, 2019
    Copy the full SHA
    33a39f6 View commit details

Commits on Nov 7, 2022

  1. Merge remote-tracking branch 'upstream/master'

    @merraksh
    merraksh committed Nov 7, 2022
    Copy the full SHA
    55dca5e View commit details
Showing with 1,763 additions and 1 deletion.
  1. +44 −0 cvxpy/problems/solvers/utilities.py
  2. +671 −0 cvxpy/problems/solvers/xpress_intf.py
  3. +1 −1 cvxpy/tests/test_examples.py
  4. +1,047 −0 cvxpy/tests/test_solvers.py
44 changes: 44 additions & 0 deletions cvxpy/problems/solvers/utilities.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
"""
Copyright 2017 Steven Diamond
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
"""

from cvxpy.problems.solvers.ecos_intf import ECOS
from cvxpy.problems.solvers.ecos_bb_intf import ECOS_BB
from cvxpy.problems.solvers.cvxopt_intf import CVXOPT
from cvxpy.problems.solvers.glpk_intf import GLPK
from cvxpy.problems.solvers.glpk_mi_intf import GLPK_MI
from cvxpy.problems.solvers.cbc_intf import CBC
from cvxpy.problems.solvers.scs_intf import SCS
from cvxpy.problems.solvers.gurobi_intf import GUROBI
from cvxpy.problems.solvers.elemental_intf import Elemental
from cvxpy.problems.solvers.mosek_intf import MOSEK
from cvxpy.problems.solvers.ls_intf import LS
from cvxpy.problems.solvers.julia_opt_intf import JuliaOpt
from cvxpy.problems.solvers.xpress_intf import XPRESS

solver_intf = [ECOS(), ECOS_BB(), CVXOPT(), GLPK(),
GLPK_MI(), CBC(), SCS(), GUROBI(),
Elemental(), MOSEK(), LS(), JuliaOpt(), XPRESS()]
SOLVERS = {solver.name(): solver for solver in solver_intf}


def installed_solvers():
"""List the installed solvers.
"""
installed = []
for name, solver in SOLVERS.items():
if solver.is_installed():
installed.append(name)
return installed
Loading