Merged
Conversation
doejoedoe
approved these changes
Dec 10, 2023
Contributor
Artem-Goldenberg
left a comment
Artem-Goldenberg
left a comment
There was a problem hiding this comment.
Все ок, как и с прошлым можешь заливать, можешь что то подправить
client/templates/main.html
Outdated
| function matchConnectionsAfterSelection(new_input_order) { | ||
| let newConnections = [] | ||
| let connections = editor.getNodeFromId(input_selection_layer_id).data.Connections | ||
| for (let i = 0; i < new_input_order.length; i++) { |
Contributor
There was a problem hiding this comment.
А почему здесь через I а не через let of?
client/templates/main.html
Outdated
| try { | ||
| path.setAttribute("display", "none") | ||
| } catch (e) { | ||
| console.log(e) |
Contributor
There was a problem hiding this comment.
Ну я так понимаю такого не должно происходит поэтому можно написать console.error или что то такое
lpetrov02
pushed a commit
that referenced
this pull request
Dec 15, 2023
* Fix input selection * Clean up fix input selection
lpetrov02
pushed a commit
that referenced
this pull request
Dec 15, 2023
* Fix input selection * Clean up fix input selection
lpetrov02
pushed a commit
that referenced
this pull request
Dec 18, 2023
Makes preparations for metrics logging on python Functionality for c++ http added, but not working yet Adds saving train metrics Adds saving train metrics and responding with PNG Adaptates code for new 4D blob cpprest CI support Add load possibility for zip Add load possibility for png on predict ------- GRA-122: Data loader implementation (#67) Data loader implementation ------- ID-154: Loss type selection (#70) * Add loss type selection * Add loss type selection * Remove layer-class loss * Clean up Loss type * Make format ------- ID-171: Fix input selection (#69) * Fix input selection * Clean up fix input selection ------- Change train and predict for zip file case Starts fixing train Fixes train with dataloader It's not fucking working :( (x3) server train fix Fixes train and predcit
lpetrov02
pushed a commit
that referenced
this pull request
Dec 18, 2023
Makes preparations for metrics logging on python Functionality for c++ http added, but not working yet Adds saving train metrics Adds saving train metrics and responding with PNG Adaptates code for new 4D blob cpprest CI support Add load possibility for zip Add load possibility for png on predict ------- GRA-122: Data loader implementation (#67) Data loader implementation ------- ID-154: Loss type selection (#70) * Add loss type selection * Add loss type selection * Remove layer-class loss * Clean up Loss type * Make format ------- ID-171: Fix input selection (#69) * Fix input selection * Clean up fix input selection ------- Change train and predict for zip file case Starts fixing train Fixes train with dataloader It's not fucking working :( (x3) server train fix Fixes train and predcit
lpetrov02
added a commit
that referenced
this pull request
Dec 20, 2023
* Started migration from Data2dLayer to DataLayer Makes preparations for metrics logging on python Functionality for c++ http added, but not working yet Adds saving train metrics Adds saving train metrics and responding with PNG Adaptates code for new 4D blob cpprest CI support Add load possibility for zip Add load possibility for png on predict ------- GRA-122: Data loader implementation (#67) Data loader implementation ------- ID-154: Loss type selection (#70) * Add loss type selection * Add loss type selection * Remove layer-class loss * Clean up Loss type * Make format ------- ID-171: Fix input selection (#69) * Fix input selection * Clean up fix input selection ------- Change train and predict for zip file case Starts fixing train Fixes train with dataloader It's not fucking working :( (x3) server train fix Fixes train and predcit * Follow up review * Follow up review * ID-167: Upload zip (#74) * Fixes graph tests * Fixes DataLayer --------- Co-authored-by: lpetrov02 <lpetrov02@mail.ru> Co-authored-by: Artem Goldenberg <58527023+Artem-Goldenberg@users.noreply.github.com>
AntoxaBarin
added a commit
that referenced
this pull request
Dec 21, 2023
* Started migration from Data2dLayer to DataLayer * Makes preparations for metrics logging on python Functionality for c++ http added, but not working yet Adds saving train metrics Adds saving train metrics and responding with PNG * Adaptates code for new 4D blob * cpprest CI support * Add load possibility for zip * Add load possibility for png on predict * GRA-122: Data loader implementation (#67) Data loader implementation * ID-154: Loss type selection (#70) * Add loss type selection * Add loss type selection * Remove layer-class loss * Clean up Loss type * Make format * ID-171: Fix input selection (#69) * Fix input selection * Clean up fix input selection * Change train and predict for zip file case * Starts fixing train * Fixes train with dataloader * It's not fucking working :( * It's not fucking working :( * Input selection bug fix * Started migration from Data2dLayer to DataLayer Makes preparations for metrics logging on python Functionality for c++ http added, but not working yet Adds saving train metrics Adds saving train metrics and responding with PNG Adaptates code for new 4D blob cpprest CI support Add load possibility for zip Add load possibility for png on predict ------- GRA-122: Data loader implementation (#67) Data loader implementation ------- ID-154: Loss type selection (#70) * Add loss type selection * Add loss type selection * Remove layer-class loss * Clean up Loss type * Make format ------- ID-171: Fix input selection (#69) * Fix input selection * Clean up fix input selection ------- Change train and predict for zip file case Starts fixing train Fixes train with dataloader It's not fucking working :( (x3) server train fix Fixes train and predcit * Follow up review * Follow up review * Make formats * Fix bug (not deleting connection after deleting layer) * Minor changes in cpp_server * tests fix * Fix order of addition inputs in layer --------- Co-authored-by: lpetrov02 <lpetrov02@mail.ru> Co-authored-by: Artem Goldenberg <st087953@student.spbu.ru> Co-authored-by: MaxVorosh <ma_voroshilov@mail.ru> Co-authored-by: Voroshilov Maksim <47945698+MaxVorosh@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
ID-171
Починил выбор входов. Потестил, сейчас всё должно нормально работать, если увидите любые баги, то сообщите. Вся проблема была в том, что внутри объекта
Sortable(штука, которая позволяет нам менять порядок входов) массивы и переменные магическим (я не знаю, как это объяснить иначе) образом принимали неверные значения послеclearModel, после переключений между слоями и тд. Сейчас же я вынес всю логику изSortableв отдельный методmatchConnectionsAfterSelection. По сути, он берет новый порядок входов, запихивает его в слой и отправляет в бд.Новые глобальные переменные в
client/scripts/storage.js:is_id_on_paths- флаг "есть ли сейчас нарисованные циферки на соединениях". Этот флаг нужен, чтоб мы лишний раз не убирали эти самые циферки с соединений.input_selection_layer_id/db_id- запоминаем библиотечные id и id из бд у слоя, которому меняем порядок входов.