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

AlkylStructureFragmenter Implementation #10

Draft
wants to merge 103 commits into
base: production
Choose a base branch
from

Commits on Apr 20, 2023

  1. added new algorithm AlkylStructureFragmenter.java; exemplary added fi…

    …rst algorithm setting
    Mila1004 committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    0d207da View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2023

  1. Configuration menu
    Copy the full SHA
    8011316 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2023

  1. Configuration menu
    Copy the full SHA
    e796701 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2023

  1. Configuration menu
    Copy the full SHA
    89988ad View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2023

  1. Configuration menu
    Copy the full SHA
    5c283d3 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2023

  1. Configuration menu
    Copy the full SHA
    9555f0a View commit details
    Browse the repository at this point in the history

Commits on May 3, 2023

  1. Configuration menu
    Copy the full SHA
    a3f5ab2 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2023

  1. Configuration menu
    Copy the full SHA
    543f941 View commit details
    Browse the repository at this point in the history
  2. added new algorithm AlkylStructureFragmenter.java; exemplary added fi…

    …rst algorithm setting
    Mila1004 authored and FelixBaensch committed May 5, 2023
    Configuration menu
    Copy the full SHA
    41b8474 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9326006 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6b71b46 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c563270 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    7139641 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    c0ae663 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    1800a8e View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    ca4a5c8 View commit details
    Browse the repository at this point in the history
  10. Merge branch 'dev-Max-alkylfragmentation' of github.com:FelixBaensch/…

    …MORTAR into dev-Max-alkylfragmentation
    FelixBaensch committed May 5, 2023
    Configuration menu
    Copy the full SHA
    9c9d1ca View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    23cc8e5 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2023

  1. Configuration menu
    Copy the full SHA
    2e328bb View commit details
    Browse the repository at this point in the history

Commits on May 10, 2023

  1. Configuration menu
    Copy the full SHA
    7c75ece View commit details
    Browse the repository at this point in the history

Commits on May 11, 2023

  1. WIP! Does not compile!

    Mila1004 committed May 11, 2023
    Configuration menu
    Copy the full SHA
    cbc1c84 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2023

  1. Configuration menu
    Copy the full SHA
    e59e0f7 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2023

  1. Configuration menu
    Copy the full SHA
    b49017c View commit details
    Browse the repository at this point in the history

Commits on May 17, 2023

  1. Configuration menu
    Copy the full SHA
    e06b346 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2023

  1. Configuration menu
    Copy the full SHA
    0c83d87 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2023

  1. Configuration menu
    Copy the full SHA
    02d12d6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7eaa4d2 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2023

  1. Configuration menu
    Copy the full SHA
    276e9f7 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2023

  1. Configuration menu
    Copy the full SHA
    a5645d4 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2023

  1. Configuration menu
    Copy the full SHA
    31a2788 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2023

  1. Configuration menu
    Copy the full SHA
    2e7d7b6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    dfd4063 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2023

  1. Configuration menu
    Copy the full SHA
    a6df6bb View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2023

  1. added ring system mapping;

    Mila1004 committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    93c4d8b View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2023

  1. Configuration menu
    Copy the full SHA
    50737bb View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2023

  1. Configuration menu
    Copy the full SHA
    7480fe8 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2023

  1. Configuration menu
    Copy the full SHA
    66b79db View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. Configuration menu
    Copy the full SHA
    14ff3c0 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. Configuration menu
    Copy the full SHA
    c4015db View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. Configuration menu
    Copy the full SHA
    204d4df View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2023

  1. overhauled molecule mapping;

    Mila1004 committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    59aaf45 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. Configuration menu
    Copy the full SHA
    ebe88e8 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. Configuration menu
    Copy the full SHA
    66e8c10 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2023

  1. Configuration menu
    Copy the full SHA
    98f5564 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2023

  1. Merge branch 'master' into dev-Max-alkylfragmentation

    * master: (23 commits)
      Fix, calculateInitialHashMapCapacity() now accepts 0 as number of elements for fragmentations that generate no fragments;
      Preparations for v1.1.1.0 release and corrected some JavaDoc warnings;
      changed some variable names; added try catch block
      added comment
      changed EventHandler; correct casting
      Adjusted context menu label listener according to review comments;
      Removed commented out code;
      Adjustments according to review comments;
      Renamed ListUtil to CollectionUtil to hopefully resolve merge conflicts;
      Fixed a bug in OverviewView;
      Histogram and overview settings are now persisted within the same session and between sessions, calls to them are now managed through view tools manager;
      Carried on harmonising view tools, started working on overview view controller, added central parseSMILES method in ChemUtil;
      Corrected package path for fragmenter classes in tutorial;
      WIP, restructuring histogram view controller;
      Went on with reworking histogram tool, wip;
      Bugfix: if a fragmenter cannot be reloaded, the respective array position is not left empty anymore;
      Renamed TabNames enum constants; ad-hoc work on HistogramViewController; added some notes in HistogramViewController;
      WIP, does not compile! Refactoring and making sure the setting properties are used and updated correctly;
      WIP, does not compile! Started adjusting the overview view;
      WIP, does not compile! A few minor changes to variable names and documentation;
      ...
    JonasSchaub committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    3c6fd9e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    736d007 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2023

  1. Configuration menu
    Copy the full SHA
    ceb9227 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    dd3eb2d View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2023

  1. WIP! on merge changes;

    Mila1004 committed Jul 16, 2023
    Configuration menu
    Copy the full SHA
    27f8952 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. Configuration menu
    Copy the full SHA
    994119c View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. Configuration menu
    Copy the full SHA
    fe10aa3 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. Configuration menu
    Copy the full SHA
    37ac325 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. added final merge changes;

    Mila1004 committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    fc98e64 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2023

  1. Configuration menu
    Copy the full SHA
    e55f047 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2023

  1. Configuration menu
    Copy the full SHA
    8457307 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2023

  1. Configuration menu
    Copy the full SHA
    975b890 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. Configuration menu
    Copy the full SHA
    92abad3 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2023

  1. added missing JavaDoc;

    Mila1004 committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    faba162 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. added test classes for ASF and CPSF; added test structures as mol fil…

    …es; fixed CPSF H-saturation bug; cleaned code;
    Mila1004 committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    91b0ae1 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2023

  1. Configuration menu
    Copy the full SHA
    722a79c View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. Configuration menu
    Copy the full SHA
    9de9877 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2023

  1. Configuration menu
    Copy the full SHA
    0167c04 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. Configuration menu
    Copy the full SHA
    9c67569 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2023

  1. Configuration menu
    Copy the full SHA
    1b2ae70 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2023

  1. Configuration menu
    Copy the full SHA
    b0ff2cc View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2023

  1. fixed ASF test class;

    Mila1004 committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    6753a04 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2023

  1. Configuration menu
    Copy the full SHA
    ad4945b View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2023

  1. pushed ASF test file;

    Mila1004 committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    80ad1bd View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2023

  1. Merge branch 'master' into dev-Max-alkylfragmentation

    * master:
      Added SonarCloud badges to readme;
      Removed unnecessary TODO block
      Added custom rule to spotless configuration to throw an error when wildcard imports are detected;
      Added spotless Gradle plugin for automatic code fomatting
      Added yml file for Gradle build in GitHub actions at push to master and pull request
      Added badges to readme
    JonasSchaub committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    9745ee6 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2023

  1. code cleanup;

    Mila1004 committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    c898b01 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. Configuration menu
    Copy the full SHA
    be7c4d1 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2023

  1. pull request changes;

    Mila1004 committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    295d5c3 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2023

  1. Configuration menu
    Copy the full SHA
    3761c2c View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2023

  1. WIP! started test rework;

    Mila1004 committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    1610a50 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2023

  1. Configuration menu
    Copy the full SHA
    6037327 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2023

  1. Configuration menu
    Copy the full SHA
    f35de14 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. Configuration menu
    Copy the full SHA
    a6bc0aa View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2023

  1. Configuration menu
    Copy the full SHA
    79a8c52 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2023

  1. Configuration menu
    Copy the full SHA
    facaa7d View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2023

  1. Configuration menu
    Copy the full SHA
    68928fc View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. reworked data stream architecture for atom- and bondarray in all meth…

    …ods (former implicit, now explicit usage);
    Mila1004 committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    a0a417b View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. Merge branch 'production' into dev-Max-alkylfragmentation

    * production: (143 commits)
      Satisfy the strict spotless and add a comment;
      Fix issue 72;
      First attempt to fix issue 72 but unsure whether everything is correct now, sometimes there seems to be one parent missing;
      Added note about new drag and drop feature to tutorial;
      MORTAR v1.2-beta
      Add missing dot to satisfy the Javadoc generator
      Add extension filter and supress multi file drop
      Check for file extension on export;
      Clean imports in MainViewController;
      Add drag'n'drop feature
      Preparations for v1.2, adjusted version numbers, updated gradle wrapper, fixed sorting of items tab again, re-introduced the always necessary preprocessing in the Ertl fragmenter, small fix in LogUtil, updated tutorial;
      Marked keepLastFragmentSetting for pipelines as deprecated and removed it from GUI; also removed it from tutorial text but not from the figures;
      New row added in pipeline settings view is now pre-set to selected fragmenter;
      Initial tutorial updates for v1.2, incomplete, but clarifies in more detail that and why MOL file bond orders higher than 4 are not parseable;
      started working on issue 59;
      adjusted widths of combo boxes and text fields in histogram view;
      Made + and - symbols on pipeline settings view bold;
      Added note about character replacement to tooltip;
      Renamed Fragment button in pipeline settings view Run and adjusted button layout of the view in general;
      Adjusted pref and max widths of text fields and combo boxes in settings view;
      ...
    
    # Conflicts:
    #	src/main/java/de/unijena/cheminf/mortar/model/fragmentation/FragmentationService.java
    #	src/main/resources/de/unijena/cheminf/mortar/message/Message_en_GB.properties
    JonasSchaub committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    9dcab44 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. applied IMoleculeFragmenter changes to AlkylStructureFragmenter and C…

    …onjugatedPiSystemFragmenter classes; WIP: test coverage, not clear why Build fails;
    Mila1004 committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    5002211 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. solved FileNotFoundException in AlkylStructureFragmenterTest; impleme…

    …nted default fragmentation test for AlkylStructureFragmenter;
    Mila1004 committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    60848fb View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. WIP! changed test resource getter; changing comparison of resulting a…

    …nd expected fragments;
    Mila1004 committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    df30210 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2024

  1. Configuration menu
    Copy the full SHA
    69fa1c0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    26c6481 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. Configuration menu
    Copy the full SHA
    b06caac View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. Configuration menu
    Copy the full SHA
    74574d8 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. Configuration menu
    Copy the full SHA
    7bca034 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2024

  1. Configuration menu
    Copy the full SHA
    4d4f007 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. Configuration menu
    Copy the full SHA
    f38737d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bba7d15 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. Configuration menu
    Copy the full SHA
    cc96daa View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

  1. Configuration menu
    Copy the full SHA
    d04d734 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. Configuration menu
    Copy the full SHA
    1ad9741 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. Configuration menu
    Copy the full SHA
    cd9aa96 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. Configuration menu
    Copy the full SHA
    b363891 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2024

  1. Configuration menu
    Copy the full SHA
    9064e97 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

  1. Configuration menu
    Copy the full SHA
    9bf6a3e View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2024

  1. Configuration menu
    Copy the full SHA
    0e47cc6 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2024

  1. Configuration menu
    Copy the full SHA
    1e5c822 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

  1. Configuration menu
    Copy the full SHA
    4bcfa15 View commit details
    Browse the repository at this point in the history