Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pseudo-branching #190

Draft
wants to merge 54 commits into
base: main
Choose a base branch
from
Draft

Pseudo-branching #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
a76e6ee
Pseudo-branching
LeChStan Jun 5, 2024
17ad8fe
Added utility function to print the values of the parameters for Pseu…
LeChStan Jun 5, 2024
f70429c
Created some examples where I can test Pseudocost branching based on …
LeChStan Jun 5, 2024
45e9d34
included the file for pseudo branching
LeChStan Jun 5, 2024
5aaed15
Made changes in order for PSEUDO_COST branching to run without failin…
LeChStan Jun 5, 2024
38e9ed9
What I have written down so far. Structure of Master Thesis not set y…
LeChStan Jun 9, 2024
1efdf5b
version_16.06
LeChStan Jun 16, 2024
424c3d0
version_16.06 with questions in yellow
LeChStan Jun 16, 2024
efd0ed3
modified example to use the diffw = Random.rand(Bool, n) * 0.6 .+ 0.3…
LeChStan Jul 3, 2024
ff5afa7
This version should perform updates to pseudocosts without extra effo…
LeChStan Jul 3, 2024
0c53bfc
changed FrankWolfeNode to include additional information and added co…
LeChStan Jul 3, 2024
400063c
added SparseArrays
LeChStan Jul 3, 2024
069cd5d
changed Bonbo.set_root! to also have the default information used by …
LeChStan Jul 3, 2024
b88555b
Modified example only to the extend needed to use pseudocost strategy
LeChStan Jul 3, 2024
2fabd32
Created a function pseudo_branch! to replace branch! in the case of p…
LeChStan Jul 10, 2024
7ebecb0
moved pseudos and branch_tracker sparse arrays to be created before c…
LeChStan Jul 10, 2024
e6768d8
passed pseudos and branch_tracker as function arguments to get_branch…
LeChStan Jul 10, 2024
0580269
Example where pseudocost decisions are made occasionaly (depends on t…
LeChStan Jul 10, 2024
0895df7
fixed some bugs and the pseudocost updates are now scaled.
LeChStan Jul 10, 2024
0d2cce3
Merge pull request #1 from LeChStan/modify_tree
LeChStan Jul 10, 2024
5c5cfbd
moved pseudo cost updates to also be made when pseudocost decisions a…
LeChStan Jul 11, 2024
f448a3d
made changes such that other branching_strategies continue to work.
LeChStan Jul 11, 2024
33590e6
changes to interface in order to match change to nodes
LeChStan Jul 13, 2024
c9f9c21
added distance to integer feasibility of parent node in order to allo…
LeChStan Jul 13, 2024
7ebb308
added another decision function (product) and made changes to how upd…
LeChStan Jul 13, 2024
79d0332
added a function to write out the content of results into 3 CSV files
LeChStan Aug 2, 2024
f422ecc
modified the result saving function to be less error prone
LeChStan Aug 4, 2024
4351da9
modified the decision functions for branching variable selection
LeChStan Aug 4, 2024
42f2417
Changes to perform updates for nodes to be discarded due to lb >= inc…
LeChStan Aug 28, 2024
d0d9040
poisson_reg run multiple examples with multiple strategies
LeChStan Aug 28, 2024
790f80e
node changed to see if a node gets pruned by strong convexity before …
LeChStan Aug 28, 2024
91752b2
hierarchical pseudobranching strategy
LeChStan Aug 28, 2024
b61d3dc
Merge pull request #2 from LeChStan/hierachy_branching
LeChStan Aug 28, 2024
5cd06cd
some fixes to make code run
LeChStan Aug 28, 2024
338546e
gradient based branching
LeChStan Aug 31, 2024
d1c52ba
alter
LeChStan Sep 17, 2024
389ae3f
alternative branching strategies
LeChStan Sep 17, 2024
9864b2a
examples modified to run multiple strategies
LeChStan Sep 17, 2024
77625bd
Deleted anything non src related to enable future merge of new branch…
LeChStan Sep 18, 2024
28f2b78
removed function which is used to save experiments from non experimen…
LeChStan Sep 18, 2024
6342af4
deleted mps-example copy for pseudocost experiments of non experiment…
LeChStan Sep 18, 2024
6274937
removed a pdf from branch
LeChStan Sep 18, 2024
fa3f29b
bug fixes for gradient (+) most infeasible strategy
LeChStan Sep 18, 2024
f153257
added all Boscia branching strategies with the exception of strong br…
LeChStan Sep 18, 2024
a7dc57f
removed CSV, DataFrames from non experiment branch
LeChStan Sep 18, 2024
be486bc
removed unwanted whitespace
LeChStan Sep 18, 2024
b519432
removing debug prints etc.
LeChStan Sep 25, 2024
eef7f20
Readability change
LeChStan Sep 26, 2024
cc4a8a4
changes made for code readability and simplicity.
LeChStan Sep 26, 2024
242794c
moving pseudocost storage and branch_tracker for pseudocost strategy …
LeChStan Oct 2, 2024
0a6690a
Modified pseudocost branching to allow multiple alternative strats
LeChStan Oct 2, 2024
1cc243c
bug fix in pseudo branching mutable struct creation
LeChStan Oct 2, 2024
753be8d
hierarchy branching change
LeChStan Oct 23, 2024
85f22eb
added best minimum decision function for pseudocost strategies
LeChStan Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/Boscia.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ using FrankWolfe
import FrankWolfe: compute_extreme_point
export compute_extreme_point
using Random
using Statistics
import Bonobo
using Printf
using Dates
using MathOptInterface
using SparseArrays
const MOI = MathOptInterface
const MOIU = MOI.Utilities
import MathOptSetDistances as MOD
Expand All @@ -23,6 +25,7 @@ include("callbacks.jl")
include("problem.jl")
include("heuristics.jl")
include("strong_branching.jl")
include("branching_strategies.jl")
include("utilities.jl")
include("interface.jl")
include("managed_blmo.jl")
Expand Down
Loading