Commit Graph

463 Commits (8a02e22a35ca530b8e64764d189da0747d1d10d4)

Author SHA1 Message Date
Alinson S. Xavier cd9e5d4144
Remove sample.after_load
4 years ago
Alinson S. Xavier b4a267a524
Remove sample.after_lp
4 years ago
Alinson S. Xavier 4093ac62fd
Remove sample.after_mip
4 years ago
Alinson S. Xavier 7c4c301611
Extract instance, var and constr features into sample
4 years ago
Alinson S. Xavier 061b1349fe
Move user_cuts/lazy_enforced to sample.data
4 years ago
Alinson S. Xavier 80281df8d8
Replace instance.samples by instance.get/push_sample
4 years ago
Alinson S. Xavier a5092cc2b9
Request constraint features/categories in bulk
4 years ago
Alinson S. Xavier 8118ab4110
Remove EnforceOverrides
4 years ago
Alinson S. Xavier 438859e493
Request variable features/categories in bulk
4 years ago
Alinson S. Xavier 6969f2ffd2
Measure time extracting features
4 years ago
Alinson S. Xavier 5b4b8adee5
LearningSolver: add extract_sa, extract_lhs arguments
4 years ago
Alinson S. Xavier 101bd94a5b
Make read/write_pickle_gz quiet
4 years ago
Alinson S. Xavier 46a7d3fe26
BenchmarkRunner.fit: Only iterate through files twice
4 years ago
Alinson S. Xavier 343afaeec0
Fix MyPy errors
4 years ago
Alinson S. Xavier 4c7e63409d Improve logging
4 years ago
Alinson S. Xavier ddd136c661
assert_equals: Handle ndarray with booleans
4 years ago
Alinson S. Xavier 52093eb1c0
Combine np.ndarray conversion with rounding
4 years ago
Alinson S. Xavier 34c71796e1
assert_equals: Recursively convert np.ndarray
4 years ago
Alinson S. Xavier cdd38cdfb8
Make assert_equals work with np.ndarray
4 years ago
Alinson S. Xavier 81b7047c4c
gurobi.py: Remove tuples
4 years ago
Alinson S. Xavier c494f3e804
Remove tuples from ConstraintFeatures
4 years ago
Alinson S. Xavier f9ac65bf9c
Remove tuples from VariableFeatures
4 years ago
Alinson S. Xavier fa969cf066
Constraint features: Fix conversion to list
4 years ago
Alinson S. Xavier 659131c8cf
Only use p_tqdm is n_jobs>1
4 years ago
Alinson S. Xavier 4bf4d09cb5
Remove unused classes and methods
4 years ago
Alinson S. Xavier 91c8db2225
Refactor StaticLazy; remove old constraint methods
4 years ago
Alinson S. Xavier 53d3e9d98a
Implement ConstraintFeatures.__getitem__
4 years ago
Alinson S. Xavier 83c46d70a3
Implement bulk constraint methods
4 years ago
Alinson S. Xavier 8e61b7be5f
Remove EnforceOverrides
4 years ago
Alinson S. Xavier 17d4bc6ab9
Remove empty docstring
4 years ago
Alinson S. Xavier 249002dcf3 Fix mypy issues
4 years ago
Alinson S. Xavier c3d26a1c75 Reduce memory consumption of parallel_solve
4 years ago
Alinson S. Xavier 0ba8cc16fd
GurobiSolver: Implement relax/enforce constraint
5 years ago
Alinson S. Xavier 4dd4ef52bd
Add with_lhs argument
5 years ago
Alinson S. Xavier 18521331c9
Extract more features to ConstraintFeatures
5 years ago
Alinson S. Xavier 230d13a5c0
Create ConstraintFeatures
5 years ago
Alinson S. Xavier 0e9c8b0a49
Rename features.constraints to constraints_old
5 years ago
Alinson S. Xavier 39597287a6
Make extractor configurable
5 years ago
Alinson S. Xavier 95e326f5f6
Use compact variable features everywhere
5 years ago
Alinson S. Xavier fec0113722
Rename features.variables to variables_old; update FeatureExtractor
5 years ago
Alinson S. Xavier 08f0bedbe0
Implement more compact get_variables
5 years ago
Alinson S. Xavier e6eca2ee7f
GurobiSolver: Performance improvements
5 years ago
Alinson S. Xavier e1f32b1798
Add n_jobs to BenchmarkRunner.fit
5 years ago
Alinson S. Xavier 77b10b9609
Parallel processing
5 years ago
Alinson S. Xavier bec7dae6d9
Add pre argument to sample_xy
5 years ago
Alinson S. Xavier a01c179341
LearningSolver: Load each instance exactly twice during fit
5 years ago
Alinson S. Xavier ef7a50e871
Only include static features in after-load
5 years ago
Alinson S. Xavier 8f41278713
GurobiSolver: Improve get_constraints
5 years ago
Alinson S. Xavier 37a1bc9fe6
Fix mypy errors
5 years ago
Alinson S. Xavier 61645491a4
GurobiSolver: Bulk query
5 years ago
Alinson S. Xavier 25affca3ec
GurobiSolver: Accept integer variables, as long as bounds=(0,1)
5 years ago
Alinson S. Xavier c4a6665825
Remove obsolete methods
5 years ago
Alinson S. Xavier c26b852c67
Update UserCutsComponent
5 years ago
Alinson S. Xavier a4433916e5
Update DynamicLazyConstraintsComponent
5 years ago
Alinson S. Xavier b5411b8950
Update ObjectiveValueComponent
5 years ago
Alinson S. Xavier a9dcdb8e4e
Update PrimalSolutionComponent
5 years ago
Alinson S. Xavier d7aa31f3eb
Fix mypy errors
5 years ago
Alinson S. Xavier 9d404f29a7
Call new fit method
5 years ago
Alinson S. Xavier cb62345acf
Refactor StaticLazy
5 years ago
Alinson S. Xavier e6672a45a0
Rename more methods to _old
5 years ago
Alinson S. Xavier 08ede5db09
Component: add new callback methods
5 years ago
Alinson S. Xavier 6f6cd3018b
Rewrite DynamicLazy.sample_xy
5 years ago
Alinson S. Xavier bccf0e9860
Rewrite StaticLazy.sample_xy
5 years ago
Alinson S. Xavier 2979bd157c
Rewrite PrimalSolutionComponent.sample_xy
5 years ago
Alinson S. Xavier d90d7762e3
Rewrite ObjectiveValueComponent.sample_xy
5 years ago
Alinson S. Xavier 2da60dd293
Rename methods that use TrainingSample to _old
5 years ago
Alinson S. Xavier 5fd13981d4
Append sample
5 years ago
Alinson S. Xavier fde6dc5a60
Combine after_load, after_lp and after_mip into Sample dataclass
5 years ago
Alinson S. Xavier 2d4ded1978
Fix some mypy issues
5 years ago
Alinson S. Xavier 16630b3a36
GurobiPyomoSolver: Extract same features as GurobiSolver
5 years ago
Alinson S. Xavier 6bc81417ac
Sort methods
5 years ago
Alinson S. Xavier fcb511a2c6
Pyomo: Collect variable reduced costs
5 years ago
Alinson S. Xavier 3cfadf4e97
Pyomo: Collect variable bounds, obj_coeff, value, type
5 years ago
Alinson S. Xavier 6b15337e4c
Add mip_stats to after-mip features
5 years ago
Alinson S. Xavier bd78518c1f
Convert MIPSolveStats into dataclass
5 years ago
Alinson S. Xavier 2bc1e21f8e
Add lp_stats to after-lp features
5 years ago
Alinson S. Xavier 945f6a091c
Convert LPSolveStats into dataclass
5 years ago
Alinson S. Xavier 6afdf2ed55
Collect features 3 times (after-load, after-lp, after-mip)
5 years ago
Alinson S. Xavier d85a63f869
Small fixes to Alvarez2017 features
5 years ago
Alinson S. Xavier c39231cb18
Implement a small subset of Alvarez2017 features
5 years ago
Alinson S. Xavier 9ca4cc3c24
Include additional features in instance.features
5 years ago
Alinson S. Xavier 733c8299e0
Add more variable features
5 years ago
Alinson S. Xavier 5e1f26e4b0
Add more constraint features
5 years ago
Alinson S. Xavier b5e602cdc1
get_constraints: Fetch slack and dual values
5 years ago
Alinson S. Xavier 088d679f61
Redesign InternalSolver constraint methods
5 years ago
Alinson S. Xavier f70363db0d
Replace build_lazy_constraint by enforce_lazy_constraint
5 years ago
Alinson S. Xavier 735884151d
Reorganize callbacks
5 years ago
Alinson S. Xavier 6ac738beb4
PyomoSolver: Implement missing constraint methods
5 years ago
Alinson S. Xavier 9368b37139
Replace individual constraint methods by single get_constraints
5 years ago
Alinson S. Xavier 626d75f25e
Reorganize internal solver tests
5 years ago
Alinson S. Xavier a8224b5a38
Move instance fixtures into the main source; remove duplication
5 years ago
Alinson S. Xavier 166cdb81d7 Fix tests
5 years ago
Alinson S. Xavier 74ceb776c3 Skip extracting features if already computed
5 years ago
Alinson S. Xavier 5116681291 Add some InternalSolver tests to main package
5 years ago
Alinson S. Xavier 3edc8139e9 Improve logging
5 years ago
Alinson S. Xavier 6330354c47 Remove EnforceOverrides; automatically convert np.ndarray features
5 years ago
Alinson S. Xavier 157825a345
mypy: Disable implicit optionals
5 years ago
Alinson S. Xavier f5606efb72
Add types to log.py
5 years ago
Alinson S. Xavier 331ee5914d
Add types to solvers
5 years ago
Alinson S. Xavier 38212fb858
Add types to tsp.py
5 years ago
Alinson S. Xavier f7545204d7
Add types to stab.py
5 years ago
Alinson S. Xavier 2c93ff38fc
Add types to knapsack.py
5 years ago
Alinson S. Xavier 0232219a0e
Make InternalSolver clonable
5 years ago
Alinson S. Xavier 96093a9b8e
Enforce more overrides
5 years ago
Alinson S. Xavier 1cf6124757
Refer to variables by varname instead of (vname, index)
5 years ago
Alinson S. Xavier 856b595d5e PickleGzInstance: Replace implicit load by load/free methods
5 years ago
Alinson S. Xavier f495297168
Remove experimental LP components
5 years ago
Alinson S. Xavier f90f295620
Reorganize instance package
5 years ago
Alinson S. Xavier 3543a2ba92
Optimize imports
5 years ago
Alinson S. Xavier 332cdbd839
Update copyright year
5 years ago
Alinson S. Xavier b0bf42e69d
Remove obsolete extractor classes
5 years ago
Alinson S. Xavier 9e7eed1dbd
Finish rewrite of user cuts component
5 years ago
Alinson S. Xavier 9f2d7439dc
Add user cut callbacks; begin rewrite of UserCutsComponent
5 years ago
Alinson S. Xavier cfb17551f1
Make sample_xy an instance method
5 years ago
Alinson S. Xavier 54c20382c9
Finish DynamicLazyConstraintsComponent rewrite
5 years ago
Alinson S. Xavier c6aee4f90d
Make sample_ method accept instance
5 years ago
Alinson S. Xavier bb91c83187
LazyDynamic: Rewrite fit method
5 years ago
Alinson S. Xavier 6e326d5d6e
Move feature classes to features.py
5 years ago
Alinson S. Xavier b11779817a
Convert TrainingSample to dataclass
5 years ago
Alinson S. Xavier aeed338837
Convert ConstraintFeatures to dataclass
5 years ago
Alinson S. Xavier 94084e0669
Convert InstanceFeatures into dataclass
5 years ago
Alinson S. Xavier d79eec5da6
Convert VariableFeatures into dataclass
5 years ago
Alinson S. Xavier 59f4f75a53
Convert Features into dataclass
5 years ago
Alinson S. Xavier f2520f33fb
Correctly store features and training data for file-based instances
5 years ago
Alinson S. Xavier 025e08f85e
LazyStatic: Use dynamic thresholds
5 years ago
Alinson S. Xavier 08e808690e
Replace InstanceIterator by PickleGzInstance
5 years ago
Alinson S. Xavier 6e614264b5
StaticLazy: Refactor
5 years ago
Alinson S. Xavier 168f56c296
Fix typos
5 years ago
Alinson S. Xavier ea5c35fe18
Objective: Refactoring
5 years ago
Alinson S. Xavier 185b95118a
Objective: Rewrite sample_evaluate
5 years ago
Alinson S. Xavier 7af22bd16b
Refactor ObjectiveValueComponent
5 years ago
Alinson S. Xavier 674c16cbed
FeaturesExtractor: Fix assertion
5 years ago
Alinson S. Xavier 7a6b31ca9a Fix benchmark scripts; add more input checks
5 years ago
Alinson S. Xavier 0bce2051a8 Redesign component.evaluate
5 years ago
Alinson S. Xavier 0c687692f7 Make all before/solve callbacks receive same parameters
5 years ago
Alinson S. Xavier 8eb2b63a85 Primal: Refactor stats
5 years ago
Alinson S. Xavier ef556f94f0 Rename xy_sample to xy
5 years ago
Alinson S. Xavier bc8fe4dc98 Components: Switch from factory methods to prototype objects
5 years ago
Alinson S. Xavier 59c734f2a1 Add ScikitLearnRegressor; move sklean classes to their own file
5 years ago
Alinson S. Xavier 820a6256c2 Make classifiers and regressors clonable
5 years ago
Alinson S. Xavier b83911a91d Primal: Add end-to-end tests
5 years ago
Alinson S. Xavier db2f426140 Primal: reactivate before_solve_mip
5 years ago
Alinson S. Xavier fe7bad885c Make xy_sample receive features, not instances
5 years ago
Alinson S. Xavier 8fc9979b37 Use instance.features in LazyStatic and Objective
5 years ago
Alinson S. Xavier 5db4addfa5 Add instance-level features to instance.features
5 years ago
Alinson S. Xavier 0f5a6745a4 Primal: Refactoring
5 years ago
Alinson S. Xavier 4f46866921 Primal: Use instance.features
5 years ago
Alinson S. Xavier 12fca1f22b Extract all features ahead of time
5 years ago
Alinson S. Xavier b3c24814b0 Refactor PrimalSolutionComponent
5 years ago
Alinson S. Xavier ec69464794 Refactor primal
5 years ago