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.

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

Lecture/combopt #281

Merged
merged 43 commits into from
Nov 27, 2021
Merged

Lecture/combopt #281

merged 43 commits into from
Nov 27, 2021

Conversation

SemyonSinchenko
Copy link
Collaborator

Это еще очень ранний WIP. Пока просто переношу части распиленной лекции по VQE в отдельные PR, чтобы все по эджайлу было.

closed #102

SemyonSinchenko and others added 23 commits October 14, 2021 11:28
Changes to be committed:
- modified:   qmlcourseRU/_toc.yml
On branch lecture/vqe
Changes to be committed:
- new file:   qmlcourseRU/book/vqeblock/vqe.md
- new file:   qmlcourseRU/book/vqeblock/vqeintro.md
On branch lecture/vqe
Changes to be committed:
- modified:   qmlcourseRU/_bibliography/references.bib
- new file:   qmlcourseRU/_static/vqeblock/vqe/Max-cut.png
- new file:   qmlcourseRU/_static/vqeblock/vqe/Mona_Lisa.png
- modified:   qmlcourseRU/_toc.yml
- modified:   qmlcourseRU/book/vqeblock/vqe.md
On branch lecture/vqe
Changes to be committed:

- modified:   qmlcourseRU/_bibliography/references.bib
- new file:   qmlcourseRU/_static/vqeblock/vqe/HWA.png
- new file:   qmlcourseRU/_static/vqeblock/vqe/Hamilton.jpg
- new file:   qmlcourseRU/_static/vqeblock/vqe/af_ordering.png
- new file:   qmlcourseRU/_static/vqeblock/vqe/bridges.png
- modified:   qmlcourseRU/book/vqeblock/vqe.md
Co-authored-by: Evgeniy Zheltonozhskiy <[email protected]>
Co-authored-by: vtrokhymenko <[email protected]>
On branch lecture/vqe
Changes to be committed:
- modified:   qmlcourseRU/book/vqeblock/vqe.md
Co-authored-by: Evgeniy Zheltonozhskiy <[email protected]>
On branch lecture/vqe
Changes to be committed:
- modified:   qmlcourseRU/book/vqeblock/vqe.md
On branch lecture/vqe
Changes to be committed:
- modified:   qmlcourseRU/_bibliography/references.bib
- modified:   qmlcourseRU/book/vqeblock/vqe.md
Огромная просьба править орфографию и вообще все, что считаете необходимым при
помощи пуша в ветку или хотя бы коммит-саджешн. Потому что эти мелкие правки
очень отвлекают, а времени до запуска очень мало.

On branch lecture/vqe
Changes to be committed:
- renamed:    qmlcourseRU/_static/vqeblock/vqe/Hamilton.jpg -> qmlcourseRU/_static/problemsblock/copt/Hamilton.jpg
- renamed:    qmlcourseRU/_static/vqeblock/vqe/bridges.png -> qmlcourseRU/_static/problemsblock/copt/bridges.png
- renamed:    qmlcourseRU/_static/vqeblock/vqe/Max-cut.png -> qmlcourseRU/_static/problemsblock/ising/Max-cut.png
- renamed:    qmlcourseRU/_static/vqeblock/vqe/af_ordering.png -> qmlcourseRU/_static/problemsblock/ising/af_ordering.png
- modified:   qmlcourseRU/_toc.yml
- new file:   qmlcourseRU/book/problems2qml/eigenvals.md
- new file:   qmlcourseRU/book/problems2qml/np2ising.md
- new file:   qmlcourseRU/book/problems2qml/problems2qmlintro.md
- new file:   qmlcourseRU/book/problemsblock/copt.md
- new file:   qmlcourseRU/book/problemsblock/ising.md
- new file:   qmlcourseRU/book/problemsblock/problemsintro.md
- new file:   qmlcourseRU/book/vqeblock/tspvqe.md
- modified:   qmlcourseRU/book/vqeblock/vqe.md
Понятно, что лучше сделать лучше, но пока as is. Можно ревьюить, но плиз все
изменения пушами или через коммит саджешн.

On branch lecture/vqe
Changes to be committed:
- modified:   qmlcourseRU/book/problemsblock/ising.md
On branch lecture/vqe
Changes to be committed:
- modified:   qmlcourseRU/book/problemsblock/copt.md
On branch lecture/vqe
Changes to be committed:
- modified:   qmlcourseRU/book/problems2qml/np2ising.md
- modified:   qmlcourseRU/book/problemsblock/copt.md
@vvssttkk
Copy link
Member

в этом pr вообще несколько лекций на сколько понял, хорошо бы разбить в последующем

Changes to be committed:
- modified:   qmlcourseRU/_bibliography/references.bib
- new file:   qmlcourseRU/_static/problemsblock/copt/Knapsack.png
- new file:   qmlcourseRU/_static/problemsblock/ising/Max-cut.png
- new file:   qmlcourseRU/_static/problemsblock/ising/af_ordering.png
- modified:   qmlcourseRU/book/problemsblock/copt.md
- new file:   qmlcourseRU/book/progblock/cirq_tfq.md
@SemyonSinchenko SemyonSinchenko changed the title [WIP] Lecture/combopt Lecture/combopt Nov 25, 2021
@vvssttkk
Copy link
Member

Можно ревьюить. Ссылка на стэйджинг-версию: http://54.89.156.216/281_merge/_build/html/book/problemsblock/copt.html

отвалился == 404

Copy link
Collaborator

@Yorko Yorko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Круто! С кодом – что надо. Существенных замечаний нет, по мелочи – делал commit suggestion.

SemyonSinchenko and others added 2 commits November 26, 2021 23:16
On branch lecture/combopt
Changes to be committed:
- modified:   qmlcourseRU/book/problemsblock/copt.md
@SemyonSinchenko
Copy link
Collaborator Author

@vtrokhymenko Я тут закончил. Тогда поправь там стиль и прочее и мержим.

@vvssttkk vvssttkk merged commit 44169f3 into master Nov 27, 2021
@vvssttkk vvssttkk deleted the lecture/combopt branch November 27, 2021 12:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Лекция про комбинаторную оптимизацию
4 participants