Skip to content
Failed

Changes

Summary

  1. Basic implementation of a split model. (commit: 677774f) (details)
  2. split support in building the graph (commit: 6ce72c8) (details)
  3. split support in uris (commit: 3657bcf) (details)
  4. split support for ref tables and main ref report (commit: 3ceeb7e) (details)
  5. split support for the 'missing' report (commit: 2d7bc3e) (details)
  6. adjusted visualizations for start-end model (commit: 6450aaf) (details)
  7. support model=split in graphs.node()/graphs.nodes() → scene graphs (commit: cde58f6) (details)
  8. model option: inscriptions happen during their parent witness's timespan (commit: e9232f9) (details)
  9. Improved label for bibliography nodes (commit: cb6bf28) (details)
  10. Improved labels in split mode (commit: 848d2a9) (details)
  11. Fixed order report for split view (commit: d290d02) (details)
  12. Report configuration (commit: cdd28ed) (details)
  13. Fix: Allow to unpickle SplitReference (commit: 06dc4c7) (details)
  14. Basic split-reverse implementation (commit: 48b20b5) (details)
  15. use subgraph in node pages (instead of separate implementation) (commit: 86f3b90) (details)
  16. Implemented witness details in a table instead of in the witnesses (commit: 6cdc24b) (details)
  17. Rank correlation with baseline ordering ignoring graph topology (commit: 7adb472) (details)
  18. Included baseline order in the refs table (commit: 1370760) (details)
  19. include nodes w/o macrogenesis data into details table etc. (commit: 72d665d) (details)
  20. fixed report for refs not in macrogenesis data (commit: ee6c778) (details)
  21. Fix: Missing witnesses got lost during load/save cycle (commit: 0489e1c) (details)
  22. optional models for temp-syn (commit: 3f01562) (details)
  23. report on temp-syn clusters (commit: 9d0c163) (details)
  24. temp-syn in config (commit: de21930) (details)
  25. export stats as CSV, as well (commit: 2d9ca3c) (details)
  26. option to modify individual bibscore values from the command line (commit: e220e4a) (details)
  27. corner case issues (commit: 7ef8a8c) (details)
  28. refactor stats page to use details table instead of redundant own (commit: cd4e5bc) (details)
  29. inscription method copy-orphans (commit: d03486a) (details)
  30. scripts for comparison experiments (commit: 07f66d2) (details)
  31. moved experimental stuff to separate subdir (commit: 507b727) (details)
  32. some experimental data (commit: 7091bbf) (details)
  33. Basic D3 based graph viewer (commit: bed3ff4) (details)
  34. Simple script to diff the order from two macrogenesis graphs (commit: 32d9a75) (details)
  35. Added dates to diff script (commit: ba2a2c5) (details)
  36. Added rank info (i.e. nodes before) (commit: 4750444) (details)
  37. Summary table & improved visualizations (commit: 93dad2b) (details)
  38. Link to files from the conflicting subsets (commit: 1a412e1) (details)
  39. graphviewer: Allow to explicitely switch on/off temp-syn (commit: 534e3ca) (details)
  40. graphviewer: (hacked) support for multiple models (commit: dd72ed5) (details)
  41. calculate Spearman rank correlation for each diff pair (commit: 5debc13) (details)
  42. graphviewer: update URL and download links on form updates (commit: 4919ae9) (details)
  43. graphviewer: update URL and download links on form updates (commit: 192c8ab) (details)
  44. Optional topologically sorted graph. (commit: cd640db) (details)
  45. Allow to collapse parallel edges in graphs. (commit: f20b7e1) (details)
  46. fixup! Optional topologically sorted graph. (commit: c2b4c07) (details)
  47. fixup! fixup! Optional topologically sorted graph. (commit: 985abda) (details)
  48. fixup! Allow to collapse parallel edges in graphs. (commit: 4fee5ad) (details)
  49. Fix: Conflict edges would disappear from split model (commit: 148b415) (details)
  50. Fix: Avoid 'None' nodes (commit: 4c84f74) (details)
  51. Graphviewer: Make rankdir configurable (commit: 0b16fce) (details)
  52. Graphviewer: Major layout update (commit: 728c466) (details)
  53. graphviewer: Adjust form according to layout (commit: 240dbcb) (details)
  54. graphviewer: Fixed the download link updating (commit: 00a0b49) (details)
  55. graphviewer: interesting nodes suggestions (commit: f2293d6) (details)
  56. graphviewer: initialize form values on load (commit: a565f1b) (details)
  57. graphviewer: Allow to configure which paths between central nodes are (commit: 0df71e7) (details)
  58. graphviewer: inscription clusters (commit: 05bb205) (details)
  59. actually use path_to (commit: 4885b30) (details)
  60. fix: None node might appear in topological order with only one reference (commit: f82910f) (details)
  61. Graphviewer: Form rearrangement (commit: d07c679) (details)
  62. Update breadcrumbs (commit: 5ed8434) (details)
  63. graphviewer: design and help adjustments (commit: b69febf) (details)
  64. graphviewer: no long message should not take away space (commit: bde1213) (details)
Commit 677774f69226c00f58d7235a543ae654fd54e385 by Thorsten Vitt
Basic implementation of a split model.

When configured using model='split', each reference (witness,
inscription etc.) is not represented by one graph node but rather by
two: one for the start of the writing process, one for the end of it.

This commit introduces the basic model, further work is required to
adjust the rest of the program to that.
(commit: 677774f)
The file was modifiedsrc/macrogen/etc/default.yaml (diff)
The file was modifiedsrc/macrogen/etc/bibscores.tsv (diff)
The file was addedsrc/macrogen/splitgraph.py
The file was modifiedsrc/macrogen/datings.py (diff)
Commit 6ce72c824f7e03dfec86b62341bca0f0049ef67f by Thorsten Vitt
split support in building the graph
(commit: 6ce72c8)
The file was modifiedsrc/macrogen/graph.py (diff)
The file was modifiedsrc/macrogen/splitgraph.py (diff)
The file was modifiedsrc/macrogen/uris.py (diff)
Commit 3ceeb7e237f1f8f07392e5f8fb02dbaa6f3212fe by Thorsten Vitt
split support for ref tables and main ref report
(commit: 3ceeb7e)
The file was modifiedsrc/macrogen/report.py (diff)
Commit 2d7bc3e232f0a53acc52651297a432136a4e5861 by Thorsten Vitt
split support for the 'missing' report
(commit: 2d7bc3e)
The file was modifiedsrc/macrogen/graph.py (diff)
The file was modifiedsrc/macrogen/report.py (diff)
The file was modifiedsrc/macrogen/splitgraph.py (diff)
Commit 6450aafe332c854e3404ba21e0af166227cd1ec2 by Thorsten Vitt
adjusted visualizations for start-end model
(commit: 6450aaf)
The file was modifiedsrc/macrogen/uris.py (diff)
The file was modifiedsrc/macrogen/visualize.py (diff)
The file was modifiedsrc/macrogen/splitgraph.py (diff)
The file was modifiedsrc/macrogen/etc/styles.yaml (diff)
Commit cde58f602dcc94c6761589fcf73a9ddd37928a86 by Thorsten Vitt
support model=split in graphs.node()/graphs.nodes() → scene graphs
(commit: cde58f6)
The file was modifiedsrc/macrogen/graph.py (diff)
The file was modifiedsrc/macrogen/splitgraph.py (diff)
Commit e9232f9a981f786f570c1d25616be002924c1b1f by Thorsten Vitt
model option: inscriptions happen during their parent witness's timespan
(commit: e9232f9)
The file was modifiedsrc/macrogen/bibliography.py (diff)
The file was modifiedsrc/macrogen/etc/bibscores.tsv (diff)
The file was modifiedsrc/macrogen/graphutils.py (diff)
The file was modifiedsrc/macrogen/etc/default.yaml (diff)
The file was modifiedsrc/macrogen/graph.py (diff)
The file was modifiedsrc/macrogen/report.py (diff)
Commit cb6bf282c4c986499021cd64af0d764463b65ae6 by Thorsten Vitt
Improved label for bibliography nodes
(commit: cb6bf28)
The file was modifiedsrc/macrogen/uris.py (diff)
The file was modifiedsrc/macrogen/report.py (diff)
The file was modifiedsrc/macrogen/splitgraph.py (diff)
Commit d290d02a5b7f2aa6a7f1df8a69b1b21c3f2abe22 by Thorsten Vitt
Fixed order report for split view
(commit: d290d02)
The file was modifiedsrc/macrogen/report.py (diff)
The file was modifiedsrc/macrogen/graph.py (diff)
The file was modifiedsrc/macrogen/config.py (diff)
The file was modifiedsrc/macrogen/report.py (diff)
Commit 06dc4c7440d869aad5ea6ec5c6edeff01d8acd23 by Thorsten Vitt
Fix: Allow to unpickle SplitReference

unpickling may call __getattr__ before the __dict__ is restored.
(commit: 06dc4c7)
The file was modifiedsrc/macrogen/splitgraph.py (diff)
Commit 48b20b55a4977581447776b7973b00c93a5f796c by Thorsten Vitt
Basic split-reverse implementation
(commit: 48b20b5)
The file was modifiedsrc/macrogen/report.py (diff)
The file was modifiedsrc/macrogen/graph.py (diff)
The file was modifiedsrc/macrogen/datings.py (diff)
The file was modifiedsrc/macrogen/etc/default.yaml (diff)
The file was modifiedsrc/macrogen/splitgraph.py (diff)
The file was addedDATAMODEL.md
Commit 86f3b90237bbce5c89c7ac11db8628cc29fdfb87 by Thorsten Vitt
use subgraph in node pages (instead of separate implementation)
(commit: 86f3b90)
The file was modifiedsrc/macrogen/report.py (diff)
Commit 6cdc24b99e89e305d5bba7c092bf0538aee2cbfe by Thorsten Vitt
Implemented witness details in a table instead of in the witnesses
(commit: 6cdc24b)
The file was modifiedtests/test_graph.py (diff)
The file was modifiedsrc/macrogen/report.py (diff)
The file was modifiedsrc/macrogen/splitgraph.py (diff)
The file was modifiedsrc/macrogen/visualize.py (diff)
The file was modifiedsrc/macrogen/graph.py (diff)
The file was modifiedDATAMODEL.md (diff)
Commit 7adb472bd71bf9ee125cc22516d4e9c0b9e45736 by Thorsten Vitt
Rank correlation with baseline ordering ignoring graph topology
(commit: 7adb472)
The file was modifiedsrc/macrogen/report.py (diff)
The file was modifiedsrc/macrogen/graph.py (diff)
Commit 137076024b52699a26332a2df5bdc0513ba112bd by Thorsten Vitt
Included baseline order in the refs table
(commit: 1370760)
The file was modifiedsrc/macrogen/report.py (diff)
The file was modifiedsrc/macrogen/graph.py (diff)
Commit 72d665de839ca6f765756718b9f424ceef789c11 by Thorsten Vitt
include nodes w/o macrogenesis data into details table etc.
(commit: 72d665d)
The file was modifiedsrc/macrogen/uris.py (diff)
The file was modifiedsrc/macrogen/graph.py (diff)
Commit ee6c77853f49274d730d8d79f5a1fd33a972fefe by Thorsten Vitt
fixed report for refs not in macrogenesis data
(commit: ee6c778)
The file was modifiedsrc/macrogen/report.py (diff)
Commit 0489e1cc1f1d6529c090bcd2b8a9d21785480ae0 by Thorsten Vitt
Fix: Missing witnesses got lost during load/save cycle
(commit: 0489e1c)
The file was modifiedsrc/macrogen/graph.py (diff)
The file was modifiedtests/test_graph.py (diff)
The file was modifiedsrc/macrogen/etc/styles.yaml (diff)
The file was modifiedsrc/macrogen/visualize.py (diff)
The file was modifiedsetup.py (diff)
The file was modifiedsrc/macrogen/etc/default.yaml (diff)
The file was modifiedsrc/macrogen/graphutils.py (diff)
The file was modifiedsrc/macrogen/etc/bibscores.tsv (diff)
The file was modifiedsrc/macrogen/graph.py (diff)
The file was modifiedsrc/macrogen/graph.py (diff)
The file was modifiedsrc/macrogen/report.py (diff)
The file was modifiedsrc/macrogen/report.py (diff)
The file was modifiedsrc/macrogen/report.py (diff)
Commit e220e4a8d08c5ece343b13ba26ea5b9587e285b4 by Thorsten Vitt
option to modify individual bibscore values from the command line
(commit: e220e4a)
The file was modifiedsrc/macrogen/main.py (diff)
The file was modifiedsrc/macrogen/report.py (diff)
The file was modifiedsrc/macrogen/graph.py (diff)
Commit cd4e5bcd128629e80b4b843267ba432e1a8b124b by Thorsten Vitt
refactor stats page to use details table instead of redundant own statistic
(commit: cd4e5bc)
The file was modifiedsrc/macrogen/report.py (diff)
Commit d03486a825e4278dc92a8e69914fd68ffc0925f3 by Thorsten Vitt
inscription method copy-orphans
(commit: d03486a)
The file was modifiedsrc/macrogen/graphutils.py (diff)
The file was modifiedsrc/macrogen/report.py (diff)
The file was modifiedsrc/macrogen/graph.py (diff)
Commit 07f66d2bc0b7fd8e4d210e8e51327d3232a47c21 by Thorsten Vitt
scripts for comparison experiments
(commit: 07f66d2)
The file was addedmergestats.py
The file was addedruns.lst
The file was addedexperiments.py
Commit 507b727ca5d90ad7b07e833beeaf0621207ad809 by Thorsten Vitt
moved experimental stuff to separate subdir
(commit: 507b727)
The file was addedutils/Diffs.ipynb
The file was addedutils/README.md
The file was addedutils/runs.lst
The file was addedutils/mergestats.py
The file was removedexperiments.py
The file was removedmergestats.py
The file was addedutils/experiments.py
The file was removedruns.lst
The file was addedexpdata/details_single-copy.csv
The file was addedexpdata/experiments.xlsx
The file was addedexpdata/details_single-copy-copy.csv
The file was addedexpdata/details_single-copy-farthest.csv
The file was addedexpdata/details_single-none.csv
The file was addedexpdata/details_reverse-inline.csv
The file was addedexpdata/details_split-none.csv
The file was addedexpdata/details_single-orphan.csv
The file was addedexpdata/details_reverse.csv
The file was addedexpdata/details_split-inline.csv
The file was addedexpdata/details_split-inline-low.csv
The file was addedexpdata/positions.csv
The file was addedexpdata/details_single-copy-nearest.csv
The file was modifiedsrc/graphviewer/templates/faustedition.html (diff)
The file was modifiedsrc/graphviewer/graphviewer.py (diff)
The file was modifiedsrc/graphviewer/templates/form.html (diff)
Commit 32d9a7596dc468bc64b2b35356a829984459e068 by Thorsten Vitt
Simple script to diff the order from two macrogenesis graphs
(commit: 32d9a75)
The file was modifiedsrc/macrogen/report.py (diff)
The file was modifiedpyproject.toml (diff)
The file was addedsrc/macrogen/diff.py
The file was modifiedsrc/macrogen/__init__.py (diff)
The file was modifiedsrc/macrogen/diff.py (diff)
The file was modifiedsrc/macrogen/etc/default.yaml (diff)
The file was modifiedsrc/macrogen/etc/logging.yaml (diff)
Commit 47504442ef8d6cf35e8468f9c9019b588f8e57e8 by Thorsten Vitt
Added rank info (i.e. nodes before)
(commit: 4750444)
The file was modifiedsrc/macrogen/graph.py (diff)
The file was modifiedsrc/macrogen/diff.py (diff)
Commit 93dad2be36c747a7b66ff30590d2e9289b1f3688 by Thorsten Vitt
Summary table & improved visualizations
(commit: 93dad2b)
The file was modifiedsrc/macrogen/diff.py (diff)
Commit 1a412e1043aede839a39f260d13bd401d5badaed by Thorsten Vitt
Link to files from the conflicting subsets
(commit: 1a412e1)
The file was modifiedsrc/macrogen/graph.py (diff)
The file was modifiedsrc/macrogen/diff.py (diff)
The file was modifiedsrc/macrogen/report.py (diff)
Commit 534e3caadd8e14539e74fcabe6c6b4ae8e87bf1b by Thorsten Vitt
graphviewer: Allow to explicitely switch on/off temp-syn
(commit: 534e3ca)
The file was modifiedsrc/macrogen/graph.py (diff)
The file was modifiedsrc/graphviewer/templates/form.html (diff)
The file was modifiedsrc/macrogen/graphutils.py (diff)
The file was modifiedsrc/graphviewer/graphviewer.py (diff)
Commit dd72ed50543c432ed3bc0731116d23041623efda by Thorsten Vitt
graphviewer: (hacked) support for multiple models
(commit: dd72ed5)
The file was modifiedsrc/graphviewer/templates/form.html (diff)
The file was modifiedsrc/graphviewer/graphviewer.py (diff)
Commit 5debc136707d25d0b476533a19ca7731c308b956 by Thorsten Vitt
calculate Spearman rank correlation for each diff pair
(commit: 5debc13)
The file was modifiedsrc/macrogen/diff.py (diff)
Commit 4919ae9db2fb129059df54ecd2de9ee5b69a77a6 by Thorsten Vitt
graphviewer: update URL and download links on form updates
(commit: 4919ae9)
The file was modifiedsrc/graphviewer/templates/form.html (diff)
Commit 192c8ab67418923e404695760495e10cbd08a49e by Thorsten Vitt
graphviewer: update URL and download links on form updates
(commit: 192c8ab)
The file was modifiedsrc/graphviewer/templates/form.html (diff)
Commit cd640db61ea5961dd73bdabd5aa122c7085fde0e by Thorsten Vitt
Optional topologically sorted graph.

When enabling this option (e.g., in the graphviewer), the references
are arranged according to the topological ordering from the model
(that is also used for ordering the witnesses in the edition).

Note that this works by introducing additional, invisible edges, so
you shouldn’t use the graph or dot file produced using this method for
anything else than visualization purposes.
(commit: cd640db)
The file was modifiedsrc/graphviewer/templates/form.html (diff)
The file was modifiedsrc/graphviewer/graphviewer.py (diff)
The file was modifiedsrc/macrogen/graph.py (diff)
Commit f20b7e1f299cd7ca1a624f8844f0219c4a4f464b by Thorsten Vitt
Allow to collapse parallel edges in graphs.
(commit: f20b7e1)
The file was modifiedsrc/graphviewer/templates/form.html (diff)
The file was modifiedsrc/macrogen/visualize.py (diff)
The file was modifiedsrc/macrogen/graphutils.py (diff)
The file was modifiedsrc/graphviewer/graphviewer.py (diff)
Commit c2b4c07db82bcf16ed9869ea81c2ac411535e3f9 by Thorsten Vitt
fixup! Optional topologically sorted graph.
(commit: c2b4c07)
The file was modifiedsrc/macrogen/visualize.py (diff)
The file was modifiedsrc/macrogen/graph.py (diff)
Commit 985abdac4d199506c671e409812d3564546cd56c by Thorsten Vitt
fixup! fixup! Optional topologically sorted graph.
(commit: 985abda)
The file was modifiedsrc/macrogen/graph.py (diff)
Commit 4fee5ad28626ba22f927dd34ae5fa0251fdb66f9 by Thorsten Vitt
fixup! Allow to collapse parallel edges in graphs.
(commit: 4fee5ad)
The file was modifiedsrc/macrogen/graphutils.py (diff)
The file was modifiedsrc/graphviewer/graphviewer.py (diff)
Commit 148b415fee953af42e16217755c9db60f3414927 by Thorsten Vitt
Fix: Conflict edges would disappear from split model
(commit: 148b415)
The file was modifiedsrc/macrogen/graph.py (diff)
The file was modifiedsrc/macrogen/graphutils.py (diff)
The file was modifiedsrc/macrogen/graph.py (diff)
Commit 0b16fce9f9ae8cd9e7df87b9c71430c805276785 by Thorsten Vitt
Graphviewer: Make rankdir configurable
(commit: 0b16fce)
The file was modifiedsrc/graphviewer/graphviewer.py (diff)
The file was modifiedsrc/graphviewer/templates/form.html (diff)
Commit 728c466c74c4d5d6376f4dc4834cab55700fb935 by Thorsten Vitt
Graphviewer: Major layout update
(commit: 728c466)
The file was modifiedsrc/graphviewer/graphviewer.py (diff)
The file was modifiedsrc/graphviewer/templates/faustedition.html (diff)
The file was modifiedsrc/graphviewer/templates/form.html (diff)
Commit 240dbcbc8c6f783981430560eef38d3812dab248 by Thorsten Vitt
graphviewer: Adjust form according to layout
(commit: 240dbcb)
The file was modifiedsrc/graphviewer/templates/form.html (diff)
Commit 00a0b4983064ce26f0e6e8d5157dda7cbd7df502 by Thorsten Vitt
graphviewer: Fixed the download link updating
(commit: 00a0b49)
The file was modifiedsrc/graphviewer/templates/form.html (diff)
Commit f2293d611d81ef01efd949d94f86c0b141ce9d3e by Thorsten Vitt
graphviewer: interesting nodes suggestions
(commit: f2293d6)
The file was modifiedsrc/graphviewer/templates/form.html (diff)
Commit a565f1b1f13a78d0b59fd233242a29ae6990df9e by Thorsten Vitt
graphviewer: initialize form values on load

This is easier then going via template, at least as long we don’t switch to something like WTForms
(commit: a565f1b)
The file was modifiedsrc/graphviewer/templates/form.html (diff)
Commit 0df71e7a749ff2bc3858a09f51da1352439ca5df by Thorsten Vitt
graphviewer: Allow to configure which paths between central nodes are included
(commit: 0df71e7)
The file was modifiedsrc/macrogen/graph.py (diff)
The file was modifiedsrc/graphviewer/graphviewer.py (diff)
The file was modifiedsrc/graphviewer/templates/form.html (diff)
The file was modifiedsrc/macrogen/graphutils.py (diff)
Commit 05bb205b5215507c1c0e1fba730925864b893e49 by Thorsten Vitt
graphviewer: inscription clusters
(commit: 05bb205)
The file was modifiedsrc/macrogen/graph.py (diff)
The file was modifiedsrc/graphviewer/graphviewer.py (diff)
The file was modifiedsrc/macrogen/graph.py (diff)
Commit f82910f1e35e6b59af2ccecc1b716d7ce215411f by Thorsten Vitt
fix: None node might appear in topological order with only one reference ...
(commit: f82910f)
The file was modifiedsrc/macrogen/graph.py (diff)
Commit d07c6794a91368cad4ef029aec0ee1125c4d1847 by Thorsten Vitt
Graphviewer: Form rearrangement
(commit: d07c679)
The file was modifiedsrc/graphviewer/templates/form.html (diff)
The file was modifiedsrc/graphviewer/templates/form.html (diff)
Commit b69febfc54f33c42c905747007e8937bbde47327 by Thorsten Vitt
graphviewer: design and help adjustments
(commit: b69febf)
The file was modifiedsrc/graphviewer/templates/faustedition.html (diff)
The file was modifiedsrc/graphviewer/templates/help.html (diff)
The file was modifiedsrc/graphviewer/templates/form.html (diff)
Commit bde1213d07c13bb7ce664adf6155f0c53bb01d66 by Thorsten Vitt
graphviewer: no long message should not take away space
(commit: bde1213)
The file was modifiedsrc/graphviewer/templates/form.html (diff)