-
Notifications
You must be signed in to change notification settings - Fork 42
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.
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
UnitsUsageDict -> UnitsUsage #522
Conversation
Codecov Report
@@ Coverage Diff @@
## release-0.4.0 #522 +/- ##
================================================
Coverage ? 84.33%
================================================
Files ? 47
Lines ? 4595
Branches ? 0
================================================
Hits ? 3875
Misses ? 720
Partials ? 0 Continue to review full report at Codecov.
|
#(master, BasisUnit) => READ_AND_WRITE) # not yet implemented | ||
) | ||
set_permission!( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It makes sense here only to indicate units which will be restored with read-and-write permission (others will be restored with read-only permission). Thus we may rename units_to_restore
to units_to_write
, and set_permission!()
to set_write_permission!()
. The latter would take only two parameters instead of three.
units_to_restore, | ||
getstoragewrapper(master, MasterBranchConstrsUnit), | ||
READ_AND_WRITE | ||
) | ||
|
||
#adding the first branching constraints | ||
restore_from_records!(units_to_restore, copy_records(parent.recordids)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
restore_from_records!()
may also take a vector of pairs (model, unit) instead of the vector of triples (only units which will be restored for writing).
@@ -74,52 +74,36 @@ restore_from_record!(model::AbstractModel, unit::AbstractStorageUnit, record::Ab | |||
)) | |||
|
|||
|
|||
""" | |||
EmptyRecord | |||
# """ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need EmptyRecord
for storage units which are not changed after initialization.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I commented because it is not used in the code nor the tests at the moment
EmptyRecordWrapper | ||
""" | ||
# """ | ||
# EmptyRecordWrapper |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The same here. EmptyRecordWrapper
will be needed for empty records.
@rrsadykov Ok I understand your comments but I would to discuss about the permissions and this method first: Coluna.jl/src/ColunaBase/storage.jl Lines 263 to 265 in c6e41a6
I think we can merge this PR in the midtime. PS: tests pass |
* dev branch to prepare release of 0.4.0 * Move storage & records in ColunaBase (#507) * Renaming in storage (#509) * RecordContainer -> RecordWrapper * state -> record * rename lot of things, remove getters of Storage not used by Algorithms * Storage -> StorageUnitWrapper * Deletion of `AbstractData` (#510) * RecordContainer -> RecordWrapper * state -> record * rename lot of things, remove getters of Storage not used by Algorithms * start removing AbstractData structs * tests ok * getunit -> getstorageunit; StorageDict -> Storage * fix docstring * Bijection StorageUnit -> Record (#518) * Bijection StorageUnit -> Record * address Ruslan's comments * Implementation of column generation stages (#525) * Implementation of column generation stages (for example, heuristic and exact stage) * Update after conversation with Guillaume + stabilization correction * Simplification for ColCutGenConquer * Some more modifs due to Guillaume comments * Counting the number of exact calls when testing the pricing stages (#530) * Add bound callback tests (#532) * add bound callback tests * include bound callback in runtests * fix test * Apply suggestions from code review Co-authored-by: Guillaume Marques <[email protected]> * add comment * Apply suggestions from code review Co-authored-by: Guillaume Marques <[email protected]> Co-authored-by: Guillaume Marques <[email protected]> * Vector of optimizers in `Formulation` (#534) * vector of optimizers in formulation * solver_id -> optimizer_id * add Manifest * update Manifest * remove Manifest because does not work * changes * rm files * address Ruslan's comment * Update src/MathProg/optimizerwrappers.jl Co-authored-by: Vitor Nesello <[email protected]> * add Manifest * change ci * remove ci change * rm Manifest Co-authored-by: Vitor Nesello <[email protected]> * UnitsUsageDict -> UnitsUsage (#522) * UnitsUsageDict -> UnitsAccess * wip * improve * tests ok * Custom data for variables and constraints (#495) * draft for support of customer data * custom data in solution * custom data for cut callback * computecoeff * store custom data of solutions in manager * add Manifest * rm Manifest * Support to custom cuts over custom data assigned to columns with new test * tests ok Co-authored-by: Artur Alves Pessoa <[email protected]> * Prototyping custom model/optimizer (#535) * Start example * wip draft * continue * add map * works with caching optimizer * varids in Env * wrong result * multiply costs by -1 * fix scaling * Apply suggestions from code review * Update test/interfaces/model.jl Co-authored-by: Lara Pontes <[email protected]> * Follow up of "custom data" (#538) * add AbstractCustomData and set/get inc_val * fix bugs * remove duplicate methods * delete unnecessary prefixes and fix some bugs * revert some changes and update docstring * custom information for dw sp (#542) * docstring for restricted master heuristic (#543) * docstring for restricted master heuristic * Update src/Algorithm/conquer.jl * Refactoring `ObjValues` & `OptimizationState` (#544) * clean + doc * move doc from objvalues to optstate; tests of objvalues; update ci * update * update branching priorioty deprecated method * tests ok * tests ok * tests ok * delete duplicated tests Co-authored-by: Ruslan Sadykov <[email protected]> Co-authored-by: Artur Pessoa <[email protected]> Co-authored-by: Lara di Cavalcanti Pontes <[email protected]> Co-authored-by: Vitor Nesello <[email protected]> Co-authored-by: Lara Pontes <[email protected]>
Task of #330
I commented EmptyRecord and EmptyStorage because there are not used at the moment.