Joeri Exelmans
|
acc222fa5a
Got undo/redo working again.
|
2 years ago |
Joeri Exelmans
|
abca3ccb0f
WIP: Parser seems to be working in GUI
|
2 years ago |
Joeri Exelmans
|
55d89b1045
WIP: Embedding of versions
|
2 years ago |
Joeri Exelmans
|
a61a4464c8
WIP: A correspondence model version 'embeds' one CS and one AS version.
|
2 years ago |
Joeri Exelmans
|
1c29c8d55b
Implement merging of versions in frontend
|
2 years ago |
Joeri Exelmans
|
14e30ca091
Move 'assert' function to 'util/assert'. Added test for util/dfs. Fixed 'bug' in DFS implementation.
|
2 years ago |
Joeri Exelmans
|
1760abf806
Fix bug when deleting a node that has a self-edge.
|
2 years ago |
Joeri Exelmans
|
8d6004a10a
Progress with Demo - still haven't got conflict types between primitive deltas figured out entirely.
|
3 years ago |
Joeri Exelmans
|
5709877acf
Progress with Demo (frontend) implementation
|
3 years ago |
Joeri Exelmans
|
72b7a05567
Versions & deltas: refactor a tiny bit, extend tests.
|
3 years ago |
Joeri Exelmans
|
410f1241d8
Improve merge algorithm + extend tests
|
3 years ago |
Joeri Exelmans
|
89c554c024
Optimize merge algorithm + extra tests
|
3 years ago |
Joeri Exelmans
|
0556e36e4c
Implement merging of versions
|
3 years ago |
Joeri Exelmans
|
b2318ae4c9
Versions are identified by the XOR of the hashes of the deltas they consist of
|
3 years ago |
Joeri Exelmans
|
b1834d40f0
Add Version class
|
3 years ago |