Odysseus Incubation
  1. Odysseus Incubation

costmodel

Public
  1. Odysseus Incubation
  2. costmodel

Commits

AuthorCommitMessageCommit dateIssues
Marco GrawunderMarco Grawunder
bd3c636a9e4MMerge branch 'development'
Marco GrawunderMarco Grawunder
fe5882b3776batch updates
Marco GrawunderMarco Grawunder
9ccc2f12f1dMMerge branch 'development'
Marco GrawunderMarco Grawunder
9acb32517baUpdate of extension for tycho
Marco GrawunderMarco Grawunder
25a39cb3e30Removed Exec Env
Marco GrawunderMarco Grawunder
23808896569MMerge branch 'development'
Marco GrawunderMarco Grawunder
25448bec2a3RemovedWarnings
Marco GrawunderMarco Grawunder
ef35ea7062aMMerge pull request #4 in OI/costmodel from development to master* commit '02c6b81e97850523566fd822521a625930065496': slf4j handling
Marco GrawunderMarco Grawunder
02c6b81e978slf4j handling
Marco GrawunderMarco Grawunder
ef57e6c5befMMerge branch 'development'
Marco GrawunderMarco Grawunder
05c78944252added solobuild profile
Tobias BrandtTobias Brandt
847aebb2c8fMMerge pull request #3 in OI/costmodel from development to master* commit '3f705d1c44d50440be335d0daeb3e58eec9bfafa': maven preparation
Tobias BrandtTobias Brandt
3f705d1c44dmaven preparation
Marco GrawunderMarco Grawunder
9918406b908MMerge pull request #2 in OI/costmodel from development to master* commit 'abcc2c4c50eb4d2d813c7bf8ca0d62d7e93c19e6': update of category odysseus_dev update odysseus_dev update
Marco GrawunderMarco Grawunder
abcc2c4c50eupdate of category
Marco GrawunderMarco Grawunder
cbe9db223c2MMerge pull request #1 in OI/costmodel from master to development* commit '5571b245ccff3316de9174151acb90c6f2d92729': odysseus_dev update odysseus_dev update maven preparations maven preparations maven preparations maven preparations maven preparations
Marco GrawunderMarco Grawunder
5571b245ccfodysseus_dev update
Marco GrawunderMarco Grawunder
04a3fbb474eodysseus_dev update
Marco GrawunderMarco Grawunder
6d379934e6fodysseus_dev update
Marco GrawunderMarco Grawunder
b4eaf71170eodysseus_dev update
Marco GrawunderMarco Grawunder
eca236039e1maven preparations
Marco GrawunderMarco Grawunder
eef31d98eb7maven preparations
Marco GrawunderMarco Grawunder
f292ea6b336maven preparations
Marco GrawunderMarco Grawunder
37552e02153maven preparations
Marco GrawunderMarco Grawunder
919b0029927maven preparations
Tobias BrandtTobias Brandt
f8360ad2554Added submodules
Tobias BrandtTobias Brandt
3b494effb71Initial commit
Tobias BrandtTobias Brandt
f62548ef2d9Commit removals
Marco GrawunderMarco Grawunder
44f18e5850eMMerge branch 'development' of https://git.swl.informatik.uni-oldenburg.de/scm/ody/odysseus into development
Marco GrawunderMarco Grawunder
3c4f0083bfbMMerge pull request #23 in ODY/odysseus from RemoveOutdatedProjects to development* commit '3d2fa6bc9c7a4d0bff86ff1fbdbb186c8995e011': Removed outdated projects
Marco GrawunderMarco Grawunder
1dd169bd37cMMerge pull request #15 in ODY/odysseus from modules to development* commit 'a80919cfea85e983dd49eb45f47506967cf6fa83': Renamed folder for cache plugin ... Moved server projects to same level Moved bundles to module folders
Marco GrawunderMarco Grawunder
9edaafc8c5fMoved bundles to module folders
Marco GrawunderMarco Grawunder
77ade2e98d5MMerge pull request #3 in ODY/odysseus from feature/ODY-1631-totimestampfromstring to development* commit 'b8853c65eab722300f8d0c3f25f2a26dec3c61a7': ODY-1631: implemented functionODY-1631
Marco GrawunderMarco Grawunder
4855805deedremoved version .qualifier --> manual update of version number required now
Marco GrawunderMarco Grawunder
0d2fd21800fMMerge pull request #421 in ODY/odysseus from bugfix/ODY-1620-xmlprocotolhandler-don-t-work-with-push to development* commit '83ba1bfdc434d40defbd7ce8943965e672cbfaef [formerly d54d760c11c516237b5cf9d85541bb4e210b974a]': ODY-1620: Always initialize result-list Former-commit-id: 813c98ca8c059813ac293ae0d087ab883056b107ODY-1620
Marco GrawunderMarco Grawunder
e265dc7ef56MMerge pull request #420 in ODY/odysseus from feature/digital-signal-processing to development* commit '4db06627db379dc6ae71ea3a47c66b27fd5df448 [formerly f08928cae80156a655ecc35c1e2b148a70beb0a6]': (33 commits) Rename InterpolationMethod interface to IInterpolationMethod Respect Base Time Improved Interpolation Documentation of abstract operators Output Schema of placeholder abstract operators FFT and Cross Correlation substitution rules Fir Filter Substitution First Ve...
Marco GrawunderMarco Grawunder
7a40fdf013eMMerge pull request #415 in ODY/odysseus from ODY-1627-anomaly-detection-output to development* commit 'b684bef96884542bc7c20b30c8be495f42e50007 [formerly f25bd300cc76a46d0d875d6ce4f484a5b23d2de2]': ODY-1627 Same changes for output on port 1 on master Former-commit-id: fc29aa6c65d6e97eeb51db9234c5f13bb03d6c2dODY-1627
Marco GrawunderMarco Grawunder
6e6fe565928MMerge pull request #407 in ODY/odysseus from bugfix/104-bugfixes to development* commit '38b115cb11e1d2ac47b364d6f66b40e6a1a4753a [formerly 53c38a2748ce62b06601a5cf6acb6de5e1ca6a91]': (44 commits) Removed resources Fixed manifest file after merge OJ104: Added dependency to slf4j again. Reviewer removed it, but it is needed. FIX: Wrong plugin reference in feature Renamed folders (same name as projects now) Some fixes for the reader. Renamed graph lib bundles ...2 Jira issues
Marco GrawunderMarco Grawunder
18458522074MMerge remote-tracking branch 'origin/development' into bugfix/104-bugfixesConflicts: common/resources/de.uniol.inf.ei.oj104/META-INF/MANIFEST.MF Former-commit-id: bc67c9019f0e7a381ed0283763ab99397bb649df
Tobias BrandtTobias Brandt
a85175534a7MMerge pull request #408 in ODY/odysseus from ODY-1612-create-feature-projects-for-resouces-bundles to development* commit 'ed208d4393ed8496de729571f4b6c721ec8cb59f [formerly 2ca0906c9126f51f7d001d59f451c78b42fb44a7]': Merge remote-tracking branch 'origin/development' into ODY-1612-create-feature-projects-for-resouces-bundles Removed resources from main repo (again) Lang3 dependency Updated reference to netzdatenstrom Updated feature refererence Updated plugin references tmp folder for remove...ODY-1612
Marco GrawunderMarco Grawunder
81730343263MMerge remote-tracking branch 'origin/development' into ODY-1612-create-feature-projects-for-resouces-bundlesConflicts: common/resources/com.google.code.gson/.classpath common/resources/com.google.code.gson/META-INF/MANIFEST.MF common/resources/com.google.code.gson/build.properties server/spatiotemporal/de.uniol.inf.odysseus.spatiotemporal/META-INF/MANIFEST.MF Former-commit-id: 49a7c81f4eded682784dd0cb445f062fe6c6fe08ODY-1612
Marco GrawunderMarco Grawunder
4d25bcd423fMMerge remote-tracking branch 'origin/development' into ODY-1612-create-feature-projects-for-resouces-bundlesConflicts: server/graph/de.uniol.inf.is.odysseus.graph.server.feature/feature.xml Former-commit-id: cd0052d9740d9d54d9776eee94c51aa81ad63ad1ODY-1612
Michael BrandMichael Brand
98a0af67fd0MMerge branch 'development' into bugfix/104-bugfixes# Conflicts: # common/resources/de.uniol.inf.ei.oj104/META-INF/MANIFEST.MF Former-commit-id: c1fb50078fdfbb600b6b80e62c57505fefcafc57
Marco GrawunderMarco Grawunder
f02edea3ce2MMerge pull request #406 in ODY/odysseus from test to ODY-1612-create-feature-projects-for-resouces-bundles* commit '0f03437aadc933ac89ab08af4d187c036fb0baad [formerly 9fcce41fe3e27a067d7f2143df220df455c4005d]': Lang3 dependency Updated reference to netzdatenstrom Updated feature refererence Updated plugin references tmp folder for removed src folders Updated target platform (new dropin location) GS-Stuff name update Former-commit-id: 13e82df37f3ff37e23fc19a8ce0d537b5efa107bODY-1612
Marco GrawunderMarco Grawunder
e62edd93a78MMerge pull request #405 in ODY/odysseus from ODY-1612-create-feature-projects-for-resouces-bundles to test* commit '5119ab0b34e3699de93799f6da19f60c3f89f5ca [formerly 8159b8de5b95fba80736a26cdc3696c8412286c1]': (77 commits) ODY-1612: Removed old restlet version ODY-1612: Removed merge conflicts ODY-1612: Working with new resources from update site ODY-1612: New target platform ODY-1612: Readmes for project changes ODY-1612: Removed Resources ODY-1612: Update to new target platform O...2 Jira issues
Marco GrawunderMarco Grawunder
46e15067d56MMerge pull request #389 in ODY/odysseus from development to master* commit 'b045ea0de337e579b1df3f1fd9fbc550848095bc [formerly 5c93028eb77f7b5978b8f548ea7d8b8b12c18f88]': ODY-1615: FIX for cases with no transport handler new MEP function that puts together an ASDU object out of its to parts, an DataUnitIdentifier and a list of IInformationObjects. new MEP function that puts together an ASDU object out of its to parts, an DataUnitIdentifier and a list of...ODY-1615
Philipp MudraPhilipp Mudra
344a01e1a27MMerge remote-tracking branch 'origin/development' into feature/digital-signal-processing Former-commit-id: f08928cae80156a655ecc35c1e2b148a70beb0a6
Philipp MudraPhilipp Mudra
2531c25ad9dMMerge remote-tracking branch 'origin/master' into feature/digital-signal-processing Former-commit-id: 5b8b4ac098db7f1cf26f6f91f49637ca5dc69a54
Tobias BrandtTobias Brandt
eed27eca6dfMMerge pull request #380 in ODY/odysseus from toString-for-temporal-trust to development* commit '3b7c165c89238149f963d36a5825e958d076853a [formerly 7db834d0cdb05c464a918fc42d652c8ed35b04f0]': A simple toString method for the temporal trust Former-commit-id: 2eb9ea075d4cf75964e33c9970509c5ca3da6d29
Tobias BrandtTobias Brandt
746a97b2930MMerge branch 'development' into toString-for-temporal-trust Former-commit-id: 7db834d0cdb05c464a918fc42d652c8ed35b04f0