1. 24 Sep, 2020 1 commit
  2. 23 Sep, 2020 1 commit
    • ipatini's avatar
      Modified control-service pom.xml to copy baguette-client.tgz from maven... · 89359b12
      ipatini authored
      Modified control-service pom.xml to copy baguette-client.tgz from maven repository, call maven-checksum-plugin to calculate MD5 checksum and copy 'install.sh', 'index.html' and 'favicon.ico' from their respective sources. Move vm.xml assembly description in baguette-client/src/main/assembly folder and renamed it to 'installation-package'. Modified control-service configuration to map http://...:8111/resources to file:resources/ (relative to working dir. rather than to $MELODIC_CONFIG_DIR). Modified control-service Dockerfile to copy baguette client installation staff into $WORKDIR/resources (rather than in config/resources)
      89359b12
  3. 22 Sep, 2020 5 commits
  4. 01 Aug, 2020 2 commits
  5. 27 Jul, 2020 2 commits
  6. 09 Jul, 2020 2 commits
  7. 21 May, 2020 1 commit
  8. 18 May, 2020 1 commit
  9. 14 May, 2020 1 commit
  10. 12 May, 2020 2 commits
  11. 11 May, 2020 5 commits
    • Alicja Reniewicz's avatar
      fix tag in ci configuration · 4995329e
      Alicja Reniewicz authored
      4995329e
    • Alicja Reniewicz's avatar
      add ci config for mcts-solver · 583170f2
      Alicja Reniewicz authored
      583170f2
    • Alicja Reniewicz's avatar
      Merge branch 'rc3.1-update-solvers' into 'rc3.1' · 2c25489e
      Alicja Reniewicz authored
      Rc3.1 update solvers
      
      See merge request !6
      2c25489e
    • Alicja Reniewicz's avatar
      Merge pull request #602 in MEL/upperware from ZPP-for-Melodic to rc3.1 · a918fa9e
      Alicja Reniewicz authored
      * commit 'dc057039': (114 commits)
        adding logging
        docker configuration for mcts-solver
        fixes after review
        changing the import in mcts solver, fixing imports
        fixes in packaging
        deleting cp_sampler and testing module which is not needed
        merge with main branch
        minor fixes
        Changed line memoryLimiter to better clarify what method does.
        Removed unnecessary assertion.
        Changed decision on which nodes are kept in queue to clarify what code does. Now all nodes are in queue.
        Removed whitespace.
        Changed the way nodes are removed from queue and the way whichNodeToPrune works (now it doesnt remove node).
        Memory limiter queue control when deleting empty solutions.
        Fixed comment in NodeImpl.
        Code style fixes according to Tomek's review.
        Some more fixes according to pr review.
        removed redundant files
        added tree printing output to gitignore
        Added exception throw when solution is infeasible
        ...
      a918fa9e
    • Marta Różańska's avatar
      adding logging · dc057039
      Marta Różańska authored
      dc057039
  12. 08 May, 2020 1 commit
  13. 07 May, 2020 3 commits
  14. 05 May, 2020 2 commits
  15. 04 May, 2020 1 commit
    • Marta Różańska's avatar
      Merge branch 'ZPP2019Master' into ZPP-for-Melodic · 84e05452
      Marta Różańska authored
      # Conflicts:
      #	zpp-solver/cp_sampler/pom.xml
      #	zpp-solver/cp_sampler/src/main/java/eu/melodic/upperware/cp_sampler/Sampler.java
      #	zpp-solver/cp_sampler/src/main/java/eu/melodic/upperware/cp_sampler/xmi_writer/XMIWriter.java
      #	zpp-solver/cp_sampler/src/test/java/SamplerTest.java
      #	zpp-solver/genetic-solver/pom.xml
      #	zpp-solver/mcts-solver/pom.xml
      #	zpp-solver/node-candidates-solver/pom.xml
      #	zpp-solver/pom.xml
      #	zpp-solver/pt-solver/pom.xml
      84e05452
  16. 29 Apr, 2020 4 commits
  17. 28 Apr, 2020 2 commits
    • Alicja Reniewicz's avatar
    • Marta Różańska's avatar
      Merge pull request #591 in MEL/upperware from mcts-tree-trimming to ZPP2019Master · 93666b21
      Marta Różańska authored
      * commit 'ff10fb82':
        minor fixes
        Changed line memoryLimiter to better clarify what method does.
        Removed unnecessary assertion.
        Changed decision on which nodes are kept in queue to clarify what code does. Now all nodes are in queue.
        Removed whitespace.
        Changed the way nodes are removed from queue and the way whichNodeToPrune works (now it doesnt remove node).
        Memory limiter queue control when deleting empty solutions.
        Fixed comment in NodeImpl.
        Code style fixes according to Tomek's review.
        Some more fixes according to pr review.
        Removed one import.
        fixed according to pr review.
        Reversed changes to test.
        Small change in tree pruning.
        Fixed a few things. Added branch trimmer.
        Added test. Cleaned up classes.
        Moved code to memory_limit package. Cleaned up code. Removed bug.
        super raw commit.
        Added experimental trimming to tree.
      93666b21
  18. 24 Apr, 2020 4 commits