Commit graph

111 commits

Author SHA1 Message Date
SebastianE 4d1241ab8a + Fixed the validation log issue, by resetting the validation log before each Problem is built. 2024-04-19 13:00:49 +02:00
Maximilian Kratz 953beea22e Enforces the Eclipse code style + organize imports on all projects 2024-04-12 15:32:39 +02:00
Maximilian Kratz 20f8c58cda Adds the missing emoflon api termination call to the GipsEngineAPI 2024-04-02 14:10:57 +02:00
Maximilian Kratz f830209234 Fixes the broken Gurobi termination 2024-03-29 07:37:28 +01:00
Maximilian Kratz ad9adf1b32 Updates Gurobi dependency to v11.0.0 2024-02-23 11:48:27 +01:00
Maximilian Kratz ee3bd74ef0 Renames the master MWE2 file for naming consistency 2023-11-10 09:55:17 +01:00
Maximilian Kratz 754c28b802 Adds launch configs + genmodel comment changes 2023-11-06 08:42:55 +01:00
Maximilian Kratz f7226c948d Only add objects to frontier collection if they are not null 2023-01-18 15:20:26 +01:00
Maximilian Kratz c5d2953fa4 Adds comment on not clearing the objectives in GipsEngine 2022-12-22 15:45:48 +01:00
Maximilian Kratz beae8209de Adds clearing of data structures for constraints
Smaller changes in/on objectives
2022-12-22 14:00:00 +01:00
Maximilian Kratz 4997162ffa Adds ILP solver reset to solver interface + engine
Bugfix for incremental solver runs
2022-12-22 09:47:34 +01:00
Maximilian Kratz 453c71b6c7 Restores code-style for all files 2022-12-21 13:20:29 +01:00
Maximilian Kratz 92d899dba4 Merge branch 'master' into feature/convenient-gt-extensions 2022-12-20 16:33:31 +01:00
Maximilian Kratz 96796d4782 Fixes a copy-paste error in the subclass processing in the TypeIndexer 2022-12-20 16:31:23 +01:00
SebastianE b7f0abf9ab minor fix 2 : electric boogaloo 2022-12-20 13:00:49 +01:00
SebastianE 08c7202d96 minor fixes 2022-12-20 12:58:19 +01:00
SebastianE 35320534e5 added super-types to type indexer 2022-12-20 12:47:44 +01:00
Maximilian Kratz 602f794a49 Bugfix in GLPK: Clear var + cnstr collections in init() 2022-12-20 11:22:25 +01:00
Maximilian Kratz 2be1daeb45 Merge branch 'master' into feature/convenient-gt-extensions 2022-12-19 11:23:20 +01:00
Maximilian Kratz be1dea4ff5 Merge branch 'master' into beta/temporary_bugfix#1 2022-12-16 16:44:36 +01:00
Maximilian Kratz 59f1a86e70 Removes all parallel streams from GIPS core (eMoflon API) 2022-12-16 16:11:11 +01:00
SebastianE 0f3f06523d fixed missing objects of subtypes 2022-12-16 15:43:17 +01:00
SebastianE f560211afa + dirty fix for multiple variable references in sums within the type context
+ fixed NPE
+ fixed real variable range
2022-12-16 11:56:56 +01:00
SebastianE aed87f4505 see branch title 2022-12-13 12:01:14 +01:00
Maximilian Kratz f4a31f19ff Snapshot: Adds model teardown to ILP solvers
TODO: CPLEX still crashes in multiple runs
2022-12-09 17:22:57 +01:00
Maximilian Kratz e3ca2816da Adds init method to load an already existing resource set as model 2022-12-09 14:57:49 +01:00
Maximilian Kratz 5a593ce457 GTMapper: Adds methods to apply matches without updates 2022-12-09 14:05:08 +01:00
Maximilian Kratz fd8860ee64 Format all source code 2022-12-09 11:25:30 +01:00
Maximilian Kratz 75c3a1ed43 Post merge fixes 2022-12-08 09:35:38 +01:00
Maximilian Kratz 962147e6d8 Merge branch 'master' into feature/variables 2022-12-08 09:15:55 +01:00
Maximilian Kratz 78dde722dc Delete, end, terminate all ILP solvers 2022-12-08 09:09:31 +01:00
SebastianE 1a075a2948 + added constraint variable bugfixes to global constraint 2022-12-07 16:40:36 +01:00
SebastianE 9b448ed5af Merge branch 'temp' into bugfix/variable_names_too_long
# Conflicts:
#	org.emoflon.gips.core/src/org/emoflon/gips/core/ilp/GurobiSolver.java
2022-12-07 16:36:33 +01:00
SebastianE e204fb73ed + fixed termination exception for match subscribers
+ added terminate call to ilp solvers
2022-12-07 16:34:12 +01:00
Maximilian Kratz c8739024ad Removes redundant var build name calls 2022-12-07 16:32:51 +01:00
Maximilian Kratz ec59f39546 Merge branch 'master' into bugfix/variable_names_too_long 2022-12-07 14:36:58 +01:00
SebastianE 7cbeba4690 + added a new variable indexing structure to prevent "variable name exceeds 255 characters..." exception 2022-12-07 14:32:04 +01:00
Maximilian Kratz 8241d04f3c Implements additional vars (setup + solution) in CPLEX & GLPK 2022-12-07 14:20:54 +01:00
Maximilian Kratz 40f8e38f04 CPLEX bugfix (LP file saving bug) 2022-12-07 14:09:26 +01:00
Maximilian Kratz 48d667f495 Fixes bound parameters + removes duplicated methods in generated code 2022-12-06 16:10:59 +01:00
Maximilian Kratz 6cdd9ad9bd Fixes var feature 2022-12-06 15:05:32 +01:00
Maximilian Kratz 13287e9ed0 Merge branch 'master' into feature/variables 2022-12-06 11:44:13 +01:00
Maximilian Kratz e6b9b93715
Merge pull request #76 from Echtzeitsysteme/feature/ilp-solver-lp-output
Include ILP solver LP file output configuration
2022-12-06 11:35:23 +01:00
Maximilian Kratz 5a4c480230 Fixes stack overflow error in translateConstraint(...) 2022-12-06 11:00:52 +01:00
Maximilian Kratz b31b92d5eb Allows for ILP solver (config) injection in engine + API 2022-11-29 17:26:53 +01:00
SebastianE 0a9e420894 finished free / bound variable feature 2022-11-29 12:32:11 +01:00
SebastianE f430a982b2 Merge remote-tracking branch 'origin/master' into feature/variables 2022-11-28 11:01:58 +01:00
SebastianE 892910f4da + initial template ideas
+ added setting of variable values post-solve
2022-11-24 17:53:06 +01:00
SebastianE bb18e02b9b + added support for bound or free variables to gips core
->TODO: Add support to templates
2022-11-24 17:20:54 +01:00
Maximilian Kratz 4f307b794e Adds LP output config to intermediate model + ILP solvers 2022-11-24 13:51:13 +01:00