Collaborative Modelling with Version Control

Kelly, Steven

doi:10.1007/978-3-319-74730-9_3

Cited by 15 publications

(13 citation statements)

References 10 publications

Supporting

Mentioning

Contrasting

Order By: Relevance

“…2.3 is also used by other three-way comparison tools such as JGit 3 or GNU diff3, 4 or by other VCSs such as Mercurial 5 or SVN. 6 However, a thorough revision on whether the line-based merging algorithms of the alternatives are equivalent to the one provided by Git should be performed.…”

Section: Limitationsmentioning

confidence: 99%

“…There is also a different family of tools for model versioning that offer specific repositories for the persistence of models. Examples of these tools are Eclipse CDO [35], EMF Store [36], MetaEdit+ [6], MagicDraw [7] or Obeo Designer [8], among others. Developing custom model repositories can provide benefits in different aspects, such as scalability, or a more controlled versioning of models.…”

Section: Related Workmentioning

confidence: 99%

“…For instance, change-based persistence techniques [36] could be applied to have a fine-grained control of the changes that are included in models, and to better detect incoming conflicts [37,38]. Another technique that is implemented by several commercial solutions allows avoiding conflicts by locking the whole model or specific parts of the model where a user is currently including modifications [6][7][8]. This technique requires working against an always-online and centralised model server, so that locking information can be distributed among all concurrent users.…”

Section: Related Workmentioning

confidence: 99%

“…In model-driven software development, models become additional software artefacts to manage during their evolution [3,4]. While there are several model storage solutions for model versioning and persistence [5][6][7][8], it is also common (if not the norm) to find models stored in mainstream filebased VCSs alongside related source code. This work focuses on the latter, specifically on EMF models persisted in the standard XMI format [9] and versioned in Git repositories.…”

Section: Introductionmentioning

confidence: 99%

See 3 more Smart Citations

An efficient line-based approach for resolving merge conflicts in XMI-based models

Vega

Kolovos

2022

Softw Syst Model

View full text Add to dashboard Cite

Conflicts in software artefacts can appear during collaborative development through version control systems. When these conflicts happen in XMI models, the conflict sections generated by diff programs break the XMI serialisation and compromise the ability to use model editors that assume well-formedness of this serialisation. While these conflict sections already mark the conflicting lines of the model, current tools for conflict resolution in models ignore them and instead load the different versions of a model from the repository, over which they perform a full and costly comparison that re-identifies the conflicts. We present a novel approach that prevents this repetition of work by directly parsing XMI-based models with conflict sections, which allows for a targeted analysis of only the lines of the model that have been detected to be in conflict by the version control system. We have implemented this approach in the Peacemaker tool, which can load XMI models with conflict sections, compute and display conflicts at the model level, and provide appropriate resolution actions. Compared with state-of-the-art model comparison tools with support for conflict resolution, Peacemaker is able to identify the vast majority of conflicts in models while reducing the required time by up to 60%. The small subset of non-identified conflicts does not introduce issues into the models, e.g. there is no loss of model information, and the resulting models after line-merging these conflicts conform to their metamodels.

show abstract

Section: Limitationsmentioning

confidence: 99%

Section: Related Workmentioning

confidence: 99%

Section: Related Workmentioning

confidence: 99%

Section: Introductionmentioning

confidence: 99%

See 2 more Smart Citations

An efficient line-based approach for resolving merge conflicts in XMI-based models

Vega

Kolovos

2022

Softw Syst Model

View full text Add to dashboard Cite

show abstract

“…All of these objects are extensible, making it straightforward to compose highly customized lensing system. Ray-tracing calculations are optimized using the packages NumPy (van der Walt et al, 2011), numba (Lam et al, 2015) and pyquad (Kelly, 2020).…”

Section: Software Api and Featuresmentioning

confidence: 99%

PyAutoLens: Open-Source Strong Gravitational Lensing

Nightingale¹,

Hayes²,

Kelly³

et al. 2021

JOSS

View full text Add to dashboard Cite

Strong gravitational lensing, which can make a background source galaxy appears multiple times due to its light rays being deflected by the mass of one or more foreground lens galaxies, provides astronomers with a powerful tool to study dark matter, cosmology and the most distant Universe. PyAutoLens is an open-source Python 3.6+ package for strong gravitational lensing, with core features including fully automated strong lens modeling of galaxies and galaxy clusters, support for direct imaging and interferometer datasets and comprehensive tools for simulating samples of strong lenses. The API allows users to perform ray-tracing by using analytic light and mass profiles to build strong lens systems. Accompanying PyAutoLens is the autolens workspace, which includes example scripts, lens datasets and the HowToLens lectures in Jupyter notebook format which introduce non-experts to strong lensing using PyAutoLens. Readers can try PyAutoLens right now by going to the introduction Jupyter notebook on Binder or checkout the readthedocs for a complete overview of PyAutoLens's features.

show abstract