From 920b1f0542ae11ff631545533e3ee6497860e8c9 Mon Sep 17 00:00:00 2001
From: Simon <simon.eismann@uni-wuerzburg.de>
Date: Fri, 8 Mar 2019 15:59:20 +0100
Subject: [PATCH] Revert "renamed models for casestudy"
This reverts commit fa9d337005653941f31c05558fa0bf540c4e089a.
---
.../CS-PetClinic/queries/extracted.properties | 4 -
.../DQL-Queries/Analysis.dql | 19 --
.../HelloWorldExample/DML-Model/My.probes | 0
.../DML-Model/My.variablemapping | 0
.../DML-Model/min.deployment | 0
.../DML-Model/min.repository | 0
.../DML-Model/min.resourcelandscape | 22 +-
.../HelloWorldExample/DML-Model/min.system | 0
.../DML-Model/min.taggedrepository | 0
.../DML-Model/min.usageprofile | 0
.../DQL-Queries/BoundsAnalysis.dql | 0
.../DQL-Queries/BoundsAnalysisComparison.dql | 0
.../DQL-Queries/DMLListDoF.dql | 2 +-
.../DQL-Queries/DMLListEntitiesQuery.dql | 0
.../DQL-Queries/DMLListMetrics.dql | 0
.../DMLSelectResponseTimeSample.dql | 0
.../HelloWorldExample/DQL-Queries/SLA_cpu.dql | 0
.../DQL-Queries/SLA_responseTime.dql | 0
.../DQL-Queries/minmodel.properties | 0
.../HelloWorldExample/DQL-Queries/report.txt | 0
.../README | 0
.../MediaStore/DML-Model/default.usageprofile | 8 +-
.../dml/extracted.deployment | 0
.../dml/extracted.repository | 0
.../dml/extracted.resourcelandscape | 0
.../dml/extracted.system | 0
.../dml/open.usageprofile | 0
.../queries/BoundsAnalysis.dql | 0
.../queries/BoundsAnalysisComparison.dql | 0
.../PetClinic/queries/extracted.properties | 3 +
.../queries/list_entities.dql | 0
.../queries/list_metrics.dql | 0
.../queries/select_cpu_utilization_avg.dql | 0
.../queries/select_responsetime_avg.dql | 0
.../queries/select_responsetime_sample.dql | 0
.../DML-Model/specjent2010.deployment | 0
.../DML-Model/specjent2010.repository | 238 +++++++++---------
.../DML-Model/specjent2010.resourcelandscape | 0
.../DML-Model/specjent2010.system | 0
.../DML-Model/specjent2010.usageprofile | 74 +++---
.../RuntimeHistogram-Queries/browse.dql | 0
.../RuntimeHistogram-Queries/manage.dql | 0
.../RuntimeHistogram-Queries/mfgejb.dql | 0
.../RuntimeHistogram-Queries/mfgws.dql | 0
.../RuntimeHistogram-Queries/purchase.dql | 0
.../RuntimeSample-Queries/browse.dql | 0
.../RuntimeSample-Queries/manage.dql | 0
.../RuntimeSample-Queries/mfgejb.dql | 0
.../RuntimeSample-Queries/mfgws.dql | 0
.../RuntimeSample-Queries/purchase.dql | 0
.../DQL-Queries/specjent2010.dql | 0
.../DQL-Queries/specjent2010.properties | 0
.../README | 0
.../DML-Model/saas.deployment | 0
.../DML-Model/saas.repository | 0
.../DML-Model/saas.resourcelandscape | 0
.../{CS-SaaS => SaaS}/DML-Model/saas.system | 0
.../DML-Model/scenario1/highload.usageprofile | 0
.../DML-Model/scenario1/lowload.usageprofile | 0
.../scenario1/mediumload.usageprofile | 0
.../scenario1/veryhighload.usageprofile | 0
.../DML-Model/scenario2/highload.usageprofile | 0
.../DML-Model/scenario2/lowload.usageprofile | 0
.../scenario2/mediumload.usageprofile | 0
.../scenario2/veryhighload.usageprofile | 0
.../DML-Model/scenario3/highload.usageprofile | 0
.../DML-Model/scenario3/lowload.usageprofile | 0
.../scenario3/mediumload.usageprofile | 0
.../scenario3/veryhighload.usageprofile | 0
.../scenario4/lowhighhigh.usageprofile | 0
.../scenario4/lowhighlow.usageprofile | 0
.../scenario4/lowlowhigh.usageprofile | 0
.../scenario4/lowlowlow.usageprofile | 0
.../scenario4/mediummediumlow.usageprofile | 0
.../{CS-SaaS => SaaS}/DQL-Queries/.gitignore | 0
.../DQL-Queries/scenario1/highload.properties | 0
.../DQL-Queries/scenario1/lowload.properties | 0
.../scenario1/mediumload.properties | 0
.../DQL-Queries/scenario1/scenario1.dql | 0
.../scenario1/veryhighload.properties | 0
.../DQL-Queries/scenario2/highload.properties | 0
.../DQL-Queries/scenario2/lowload.properties | 0
.../scenario2/mediumload.properties | 0
.../DQL-Queries/scenario2/scenario2.dql | 0
.../scenario2/veryhighload.properties | 0
.../DQL-Queries/scenario3/highload.properties | 0
.../DQL-Queries/scenario3/lowload.properties | 0
.../scenario3/mediumload.properties | 0
.../DQL-Queries/scenario3/scenario3.dql | 0
.../scenario3/veryhighload.properties | 0
.../scenario4/lowhighhigh.properties | 0
.../scenario4/lowhighlow.properties | 0
.../scenario4/lowlowhigh.properties | 0
.../scenario4/lowlowlow.properties | 0
.../scenario4/mediummediumlow.properties | 0
.../DQL-Queries/scenario4/scenario4.dql | 0
dml-examples/{CS-SaaS => SaaS}/README | 0
.../DML-Model/min.deployment | 0
.../DML-Model/min.repository | 0
.../DML-Model/min.resourcelandscape | 0
.../DML-Model/min.system | 0
.../DML-Model/min.system.bak | 0
.../DML-Model/min.usageprofile | 0
.../DQL-Queries/Analysis.dql} | 0
.../DQL-Queries/Analysis_A.dql | 0
.../DQL-Queries/Analysis_B.dql | 0
.../DQL-Queries/Analysis_C.dql | 0
.../DQL-Queries/Analysis_CE.dql | 0
.../DQL-Queries/Analysis_CF.dql | 0
.../DQL-Queries/Analysis_CG.dql | 0
.../DQL-Queries/Analysis_D.dql | 0
.../DQL-Queries/Analysis_DE.dql | 0
.../DQL-Queries/Analysis_E.dql | 0
.../DQL-Queries/Analysis_F.dql | 0
.../DQL-Queries/Analysis_G.dql | 0
.../DQL-Queries/TimeAnalysis_A.dql | 0
.../DQL-Queries/TimeAnalysis_B.dql | 0
.../DQL-Queries/TimeAnalysis_C.dql | 0
.../DQL-Queries/TimeAnalysis_CE.dql | 0
.../DQL-Queries/TimeAnalysis_CF.dql | 0
.../DQL-Queries/TimeAnalysis_CG.dql | 0
.../DQL-Queries/TimeAnalysis_D.dql | 0
.../DQL-Queries/TimeAnalysis_DE.dql | 0
.../DQL-Queries/TimeAnalysis_E.dql | 0
.../DQL-Queries/TimeAnalysis_F.dql | 0
.../DQL-Queries/TimeAnalysis_G.dql | 0
.../DQL-Queries/minmodel.properties | 0
.../README | 0
128 files changed, 175 insertions(+), 195 deletions(-)
delete mode 100644 dml-examples/CS-PetClinic/queries/extracted.properties
delete mode 100644 dml-examples/CS-SyntheticComponents/DQL-Queries/Analysis.dql
rename dml-examples/{MediaStore => }/HelloWorldExample/DML-Model/My.probes (100%)
rename dml-examples/{MediaStore => }/HelloWorldExample/DML-Model/My.variablemapping (100%)
rename dml-examples/{MediaStore => }/HelloWorldExample/DML-Model/min.deployment (100%)
rename dml-examples/{MediaStore => }/HelloWorldExample/DML-Model/min.repository (100%)
rename dml-examples/{MediaStore => }/HelloWorldExample/DML-Model/min.resourcelandscape (98%)
rename dml-examples/{MediaStore => }/HelloWorldExample/DML-Model/min.system (100%)
rename dml-examples/{MediaStore => }/HelloWorldExample/DML-Model/min.taggedrepository (100%)
rename dml-examples/{MediaStore => }/HelloWorldExample/DML-Model/min.usageprofile (100%)
rename dml-examples/{MediaStore => }/HelloWorldExample/DQL-Queries/BoundsAnalysis.dql (100%)
rename dml-examples/{MediaStore => }/HelloWorldExample/DQL-Queries/BoundsAnalysisComparison.dql (100%)
rename dml-examples/{MediaStore => }/HelloWorldExample/DQL-Queries/DMLListDoF.dql (97%)
rename dml-examples/{MediaStore => }/HelloWorldExample/DQL-Queries/DMLListEntitiesQuery.dql (100%)
rename dml-examples/{MediaStore => }/HelloWorldExample/DQL-Queries/DMLListMetrics.dql (100%)
rename dml-examples/{MediaStore => }/HelloWorldExample/DQL-Queries/DMLSelectResponseTimeSample.dql (100%)
rename dml-examples/{MediaStore => }/HelloWorldExample/DQL-Queries/SLA_cpu.dql (100%)
rename dml-examples/{MediaStore => }/HelloWorldExample/DQL-Queries/SLA_responseTime.dql (100%)
rename dml-examples/{CS-SyntheticComponents => HelloWorldExample}/DQL-Queries/minmodel.properties (100%)
rename dml-examples/{MediaStore => }/HelloWorldExample/DQL-Queries/report.txt (100%)
rename dml-examples/{CS-SyntheticComponents => HelloWorldExample}/README (100%)
rename dml-examples/{CS-PetClinic => PetClinic}/dml/extracted.deployment (100%)
rename dml-examples/{CS-PetClinic => PetClinic}/dml/extracted.repository (100%)
rename dml-examples/{CS-PetClinic => PetClinic}/dml/extracted.resourcelandscape (100%)
rename dml-examples/{CS-PetClinic => PetClinic}/dml/extracted.system (100%)
rename dml-examples/{CS-PetClinic => PetClinic}/dml/open.usageprofile (100%)
rename dml-examples/{CS-PetClinic => PetClinic}/queries/BoundsAnalysis.dql (100%)
rename dml-examples/{CS-PetClinic => PetClinic}/queries/BoundsAnalysisComparison.dql (100%)
create mode 100644 dml-examples/PetClinic/queries/extracted.properties
rename dml-examples/{CS-PetClinic => PetClinic}/queries/list_entities.dql (100%)
rename dml-examples/{CS-PetClinic => PetClinic}/queries/list_metrics.dql (100%)
rename dml-examples/{CS-PetClinic => PetClinic}/queries/select_cpu_utilization_avg.dql (100%)
rename dml-examples/{CS-PetClinic => PetClinic}/queries/select_responsetime_avg.dql (100%)
rename dml-examples/{CS-PetClinic => PetClinic}/queries/select_responsetime_sample.dql (100%)
rename dml-examples/{CS-SPECjEnterprise2010 => SPECjEnterprise2010}/DML-Model/specjent2010.deployment (100%)
rename dml-examples/{CS-SPECjEnterprise2010 => SPECjEnterprise2010}/DML-Model/specjent2010.repository (95%)
rename dml-examples/{CS-SPECjEnterprise2010 => SPECjEnterprise2010}/DML-Model/specjent2010.resourcelandscape (100%)
rename dml-examples/{CS-SPECjEnterprise2010 => SPECjEnterprise2010}/DML-Model/specjent2010.system (100%)
rename dml-examples/{CS-SPECjEnterprise2010 => SPECjEnterprise2010}/DML-Model/specjent2010.usageprofile (90%)
rename dml-examples/{CS-SPECjEnterprise2010 => SPECjEnterprise2010}/DQL-Queries/RuntimeHistogram-Queries/browse.dql (100%)
rename dml-examples/{CS-SPECjEnterprise2010 => SPECjEnterprise2010}/DQL-Queries/RuntimeHistogram-Queries/manage.dql (100%)
rename dml-examples/{CS-SPECjEnterprise2010 => SPECjEnterprise2010}/DQL-Queries/RuntimeHistogram-Queries/mfgejb.dql (100%)
rename dml-examples/{CS-SPECjEnterprise2010 => SPECjEnterprise2010}/DQL-Queries/RuntimeHistogram-Queries/mfgws.dql (100%)
rename dml-examples/{CS-SPECjEnterprise2010 => SPECjEnterprise2010}/DQL-Queries/RuntimeHistogram-Queries/purchase.dql (100%)
rename dml-examples/{CS-SPECjEnterprise2010 => SPECjEnterprise2010}/DQL-Queries/RuntimeSample-Queries/browse.dql (100%)
rename dml-examples/{CS-SPECjEnterprise2010 => SPECjEnterprise2010}/DQL-Queries/RuntimeSample-Queries/manage.dql (100%)
rename dml-examples/{CS-SPECjEnterprise2010 => SPECjEnterprise2010}/DQL-Queries/RuntimeSample-Queries/mfgejb.dql (100%)
rename dml-examples/{CS-SPECjEnterprise2010 => SPECjEnterprise2010}/DQL-Queries/RuntimeSample-Queries/mfgws.dql (100%)
rename dml-examples/{CS-SPECjEnterprise2010 => SPECjEnterprise2010}/DQL-Queries/RuntimeSample-Queries/purchase.dql (100%)
rename dml-examples/{CS-SPECjEnterprise2010 => SPECjEnterprise2010}/DQL-Queries/specjent2010.dql (100%)
rename dml-examples/{CS-SPECjEnterprise2010 => SPECjEnterprise2010}/DQL-Queries/specjent2010.properties (100%)
rename dml-examples/{CS-SPECjEnterprise2010 => SPECjEnterprise2010}/README (100%)
rename dml-examples/{CS-SaaS => SaaS}/DML-Model/saas.deployment (100%)
rename dml-examples/{CS-SaaS => SaaS}/DML-Model/saas.repository (100%)
rename dml-examples/{CS-SaaS => SaaS}/DML-Model/saas.resourcelandscape (100%)
rename dml-examples/{CS-SaaS => SaaS}/DML-Model/saas.system (100%)
rename dml-examples/{CS-SaaS => SaaS}/DML-Model/scenario1/highload.usageprofile (100%)
rename dml-examples/{CS-SaaS => SaaS}/DML-Model/scenario1/lowload.usageprofile (100%)
rename dml-examples/{CS-SaaS => SaaS}/DML-Model/scenario1/mediumload.usageprofile (100%)
rename dml-examples/{CS-SaaS => SaaS}/DML-Model/scenario1/veryhighload.usageprofile (100%)
rename dml-examples/{CS-SaaS => SaaS}/DML-Model/scenario2/highload.usageprofile (100%)
rename dml-examples/{CS-SaaS => SaaS}/DML-Model/scenario2/lowload.usageprofile (100%)
rename dml-examples/{CS-SaaS => SaaS}/DML-Model/scenario2/mediumload.usageprofile (100%)
rename dml-examples/{CS-SaaS => SaaS}/DML-Model/scenario2/veryhighload.usageprofile (100%)
rename dml-examples/{CS-SaaS => SaaS}/DML-Model/scenario3/highload.usageprofile (100%)
rename dml-examples/{CS-SaaS => SaaS}/DML-Model/scenario3/lowload.usageprofile (100%)
rename dml-examples/{CS-SaaS => SaaS}/DML-Model/scenario3/mediumload.usageprofile (100%)
rename dml-examples/{CS-SaaS => SaaS}/DML-Model/scenario3/veryhighload.usageprofile (100%)
rename dml-examples/{CS-SaaS => SaaS}/DML-Model/scenario4/lowhighhigh.usageprofile (100%)
rename dml-examples/{CS-SaaS => SaaS}/DML-Model/scenario4/lowhighlow.usageprofile (100%)
rename dml-examples/{CS-SaaS => SaaS}/DML-Model/scenario4/lowlowhigh.usageprofile (100%)
rename dml-examples/{CS-SaaS => SaaS}/DML-Model/scenario4/lowlowlow.usageprofile (100%)
rename dml-examples/{CS-SaaS => SaaS}/DML-Model/scenario4/mediummediumlow.usageprofile (100%)
rename dml-examples/{CS-SaaS => SaaS}/DQL-Queries/.gitignore (100%)
rename dml-examples/{CS-SaaS => SaaS}/DQL-Queries/scenario1/highload.properties (100%)
rename dml-examples/{CS-SaaS => SaaS}/DQL-Queries/scenario1/lowload.properties (100%)
rename dml-examples/{CS-SaaS => SaaS}/DQL-Queries/scenario1/mediumload.properties (100%)
rename dml-examples/{CS-SaaS => SaaS}/DQL-Queries/scenario1/scenario1.dql (100%)
rename dml-examples/{CS-SaaS => SaaS}/DQL-Queries/scenario1/veryhighload.properties (100%)
rename dml-examples/{CS-SaaS => SaaS}/DQL-Queries/scenario2/highload.properties (100%)
rename dml-examples/{CS-SaaS => SaaS}/DQL-Queries/scenario2/lowload.properties (100%)
rename dml-examples/{CS-SaaS => SaaS}/DQL-Queries/scenario2/mediumload.properties (100%)
rename dml-examples/{CS-SaaS => SaaS}/DQL-Queries/scenario2/scenario2.dql (100%)
rename dml-examples/{CS-SaaS => SaaS}/DQL-Queries/scenario2/veryhighload.properties (100%)
rename dml-examples/{CS-SaaS => SaaS}/DQL-Queries/scenario3/highload.properties (100%)
rename dml-examples/{CS-SaaS => SaaS}/DQL-Queries/scenario3/lowload.properties (100%)
rename dml-examples/{CS-SaaS => SaaS}/DQL-Queries/scenario3/mediumload.properties (100%)
rename dml-examples/{CS-SaaS => SaaS}/DQL-Queries/scenario3/scenario3.dql (100%)
rename dml-examples/{CS-SaaS => SaaS}/DQL-Queries/scenario3/veryhighload.properties (100%)
rename dml-examples/{CS-SaaS => SaaS}/DQL-Queries/scenario4/lowhighhigh.properties (100%)
rename dml-examples/{CS-SaaS => SaaS}/DQL-Queries/scenario4/lowhighlow.properties (100%)
rename dml-examples/{CS-SaaS => SaaS}/DQL-Queries/scenario4/lowlowhigh.properties (100%)
rename dml-examples/{CS-SaaS => SaaS}/DQL-Queries/scenario4/lowlowlow.properties (100%)
rename dml-examples/{CS-SaaS => SaaS}/DQL-Queries/scenario4/mediummediumlow.properties (100%)
rename dml-examples/{CS-SaaS => SaaS}/DQL-Queries/scenario4/scenario4.dql (100%)
rename dml-examples/{CS-SaaS => SaaS}/README (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DML-Model/min.deployment (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DML-Model/min.repository (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DML-Model/min.resourcelandscape (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DML-Model/min.system (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DML-Model/min.system.bak (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DML-Model/min.usageprofile (100%)
rename dml-examples/{CS-SyntheticComponents/DQL-Queries/TimeAnalysis.dql => SyntheticComponents/DQL-Queries/Analysis.dql} (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DQL-Queries/Analysis_A.dql (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DQL-Queries/Analysis_B.dql (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DQL-Queries/Analysis_C.dql (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DQL-Queries/Analysis_CE.dql (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DQL-Queries/Analysis_CF.dql (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DQL-Queries/Analysis_CG.dql (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DQL-Queries/Analysis_D.dql (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DQL-Queries/Analysis_DE.dql (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DQL-Queries/Analysis_E.dql (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DQL-Queries/Analysis_F.dql (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DQL-Queries/Analysis_G.dql (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DQL-Queries/TimeAnalysis_A.dql (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DQL-Queries/TimeAnalysis_B.dql (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DQL-Queries/TimeAnalysis_C.dql (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DQL-Queries/TimeAnalysis_CE.dql (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DQL-Queries/TimeAnalysis_CF.dql (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DQL-Queries/TimeAnalysis_CG.dql (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DQL-Queries/TimeAnalysis_D.dql (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DQL-Queries/TimeAnalysis_DE.dql (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DQL-Queries/TimeAnalysis_E.dql (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DQL-Queries/TimeAnalysis_F.dql (100%)
rename dml-examples/{CS-SyntheticComponents => SyntheticComponents}/DQL-Queries/TimeAnalysis_G.dql (100%)
rename dml-examples/{MediaStore/HelloWorldExample => SyntheticComponents}/DQL-Queries/minmodel.properties (100%)
rename dml-examples/{MediaStore/HelloWorldExample => SyntheticComponents}/README (100%)
diff --git a/dml-examples/CS-PetClinic/queries/extracted.properties b/dml-examples/CS-PetClinic/queries/extracted.properties
deleted file mode 100644
index caa8a12..0000000
--- a/dml-examples/CS-PetClinic/queries/extracted.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-## Model Instance
-dml.files.usageprofile=/../dml/open.usageprofile
-dml.files.deployment=/../dml/extracted.deployment
-simqpn.totalRunLength=100
\ No newline at end of file
diff --git a/dml-examples/CS-SyntheticComponents/DQL-Queries/Analysis.dql b/dml-examples/CS-SyntheticComponents/DQL-Queries/Analysis.dql
deleted file mode 100644
index 05e052d..0000000
--- a/dml-examples/CS-SyntheticComponents/DQL-Queries/Analysis.dql
+++ /dev/null
@@ -1,19 +0,0 @@
-SELECT usageToA.avgResponseTime, usageToA.throughput
-EVALUATE DOF
- VARYING 'ExponentialDistribution of OpenWorkload with ID _yiFNMEeqEeSW4Op0B0CyhQ' <0.010, 0.015, 0.020, 0.025, 0.030, 0.035, 0.040>
-FOR SERVICE '_yiFNMEeqEeSW4Op0B0CyhQ' AS usagescenario,
- SERVICE '_A_DeMEmxEeOPLK3yYyEQWQ' AS usageToA,
- SERVICE '_PVKcgO2eEeib_P5jAe7dPw' AS ToG,
- SERVICE '_jPXogO2bEeib_P5jAe7dPw' AS ToB,
- SERVICE '_W7bVMO2cEeib_P5jAe7dPw' AS ToD,
- SERVICE '_NSR-wO2eEeib_P5jAe7dPw' AS ToF,
- SERVICE '_1XjV4O2bEeib_P5jAe7dPw' AS ToC,
- SERVICE '_3Nfj0O2bEeib_P5jAe7dPw' AS ToE,
- RESOURCE '_W2LhdO2fEeib_P5jAe7dPw' AS CPE_CPU,
- RESOURCE '_I3tj4EnuEeOWVc_o6w1CBw' AS CPA_CPU,
- RESOURCE '_Wr9OdO2fEeib_P5jAe7dPw' AS CPD_CPU,
- RESOURCE '_W9C-dO2fEeib_P5jAe7dPw' AS CPF_CPU,
- RESOURCE '_We1_hO2fEeib_P5jAe7dPw' AS CPB_CPU,
- RESOURCE '_WjRMhO2fEeib_P5jAe7dPw' AS CPC_CPU,
- RESOURCE '_XFIjdO2fEeib_P5jAe7dPw' AS CPG_CPU
-USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/MediaStore/HelloWorldExample/DML-Model/My.probes b/dml-examples/HelloWorldExample/DML-Model/My.probes
similarity index 100%
rename from dml-examples/MediaStore/HelloWorldExample/DML-Model/My.probes
rename to dml-examples/HelloWorldExample/DML-Model/My.probes
diff --git a/dml-examples/MediaStore/HelloWorldExample/DML-Model/My.variablemapping b/dml-examples/HelloWorldExample/DML-Model/My.variablemapping
similarity index 100%
rename from dml-examples/MediaStore/HelloWorldExample/DML-Model/My.variablemapping
rename to dml-examples/HelloWorldExample/DML-Model/My.variablemapping
diff --git a/dml-examples/MediaStore/HelloWorldExample/DML-Model/min.deployment b/dml-examples/HelloWorldExample/DML-Model/min.deployment
similarity index 100%
rename from dml-examples/MediaStore/HelloWorldExample/DML-Model/min.deployment
rename to dml-examples/HelloWorldExample/DML-Model/min.deployment
diff --git a/dml-examples/MediaStore/HelloWorldExample/DML-Model/min.repository b/dml-examples/HelloWorldExample/DML-Model/min.repository
similarity index 100%
rename from dml-examples/MediaStore/HelloWorldExample/DML-Model/min.repository
rename to dml-examples/HelloWorldExample/DML-Model/min.repository
diff --git a/dml-examples/MediaStore/HelloWorldExample/DML-Model/min.resourcelandscape b/dml-examples/HelloWorldExample/DML-Model/min.resourcelandscape
similarity index 98%
rename from dml-examples/MediaStore/HelloWorldExample/DML-Model/min.resourcelandscape
rename to dml-examples/HelloWorldExample/DML-Model/min.resourcelandscape
index 4cd6edc..9d20cd2 100644
--- a/dml-examples/MediaStore/HelloWorldExample/DML-Model/min.resourcelandscape
+++ b/dml-examples/HelloWorldExample/DML-Model/min.resourcelandscape
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourceconfiguration="http://www.descartes.tools/metamodel/resourceconfiguration/1.0" xmlns:resourcelandscape="http://www.descartes.tools/metamodel/resourcelandscape/0.1" id="_FE29UEnuEeOWVc_o6w1CBw" name="ddc">
- <consistsOf id="_FnQfwEnuEeOWVc_o6w1CBw" name="dc">
- <computeNodes id="_EuLk4ObvEeWHMYaSILpfIw" name="CPU">
- <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_I3tj4EnuEeOWVc_o6w1CBw" name="processingCPU" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0">
- <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
- <nrOfParProcUnits id="_PUJdkAJEEeaYI8Ji-SVFxg" name="multiplicity" number="1"/>
- </configSpec>
- </computeNodes>
- </consistsOf>
-</resourcelandscape:DistributedDataCenter>
+<?xml version="1.0" encoding="UTF-8"?>
+<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourceconfiguration="http://www.descartes.tools/metamodel/resourceconfiguration/1.0" xmlns:resourcelandscape="http://www.descartes.tools/metamodel/resourcelandscape/0.1" id="_FE29UEnuEeOWVc_o6w1CBw" name="ddc">
+ <consistsOf id="_FnQfwEnuEeOWVc_o6w1CBw" name="dc">
+ <computeNodes id="_EuLk4ObvEeWHMYaSILpfIw" name="CPU">
+ <configSpec xsi:type="resourceconfiguration:ProcessingResourceSpecification" id="_I3tj4EnuEeOWVc_o6w1CBw" name="processingCPU" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0">
+ <processingResourceType href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+ <nrOfParProcUnits id="_PUJdkAJEEeaYI8Ji-SVFxg" name="multiplicity" number="1"/>
+ </configSpec>
+ </computeNodes>
+ </consistsOf>
+</resourcelandscape:DistributedDataCenter>
diff --git a/dml-examples/MediaStore/HelloWorldExample/DML-Model/min.system b/dml-examples/HelloWorldExample/DML-Model/min.system
similarity index 100%
rename from dml-examples/MediaStore/HelloWorldExample/DML-Model/min.system
rename to dml-examples/HelloWorldExample/DML-Model/min.system
diff --git a/dml-examples/MediaStore/HelloWorldExample/DML-Model/min.taggedrepository b/dml-examples/HelloWorldExample/DML-Model/min.taggedrepository
similarity index 100%
rename from dml-examples/MediaStore/HelloWorldExample/DML-Model/min.taggedrepository
rename to dml-examples/HelloWorldExample/DML-Model/min.taggedrepository
diff --git a/dml-examples/MediaStore/HelloWorldExample/DML-Model/min.usageprofile b/dml-examples/HelloWorldExample/DML-Model/min.usageprofile
similarity index 100%
rename from dml-examples/MediaStore/HelloWorldExample/DML-Model/min.usageprofile
rename to dml-examples/HelloWorldExample/DML-Model/min.usageprofile
diff --git a/dml-examples/MediaStore/HelloWorldExample/DQL-Queries/BoundsAnalysis.dql b/dml-examples/HelloWorldExample/DQL-Queries/BoundsAnalysis.dql
similarity index 100%
rename from dml-examples/MediaStore/HelloWorldExample/DQL-Queries/BoundsAnalysis.dql
rename to dml-examples/HelloWorldExample/DQL-Queries/BoundsAnalysis.dql
diff --git a/dml-examples/MediaStore/HelloWorldExample/DQL-Queries/BoundsAnalysisComparison.dql b/dml-examples/HelloWorldExample/DQL-Queries/BoundsAnalysisComparison.dql
similarity index 100%
rename from dml-examples/MediaStore/HelloWorldExample/DQL-Queries/BoundsAnalysisComparison.dql
rename to dml-examples/HelloWorldExample/DQL-Queries/BoundsAnalysisComparison.dql
diff --git a/dml-examples/MediaStore/HelloWorldExample/DQL-Queries/DMLListDoF.dql b/dml-examples/HelloWorldExample/DQL-Queries/DMLListDoF.dql
similarity index 97%
rename from dml-examples/MediaStore/HelloWorldExample/DQL-Queries/DMLListDoF.dql
rename to dml-examples/HelloWorldExample/DQL-Queries/DMLListDoF.dql
index be6a3cd..784cf7c 100644
--- a/dml-examples/MediaStore/HelloWorldExample/DQL-Queries/DMLListDoF.dql
+++ b/dml-examples/HelloWorldExample/DQL-Queries/DMLListDoF.dql
@@ -1,2 +1,2 @@
-LIST DOF
+LIST DOF
USING dml@'minmodel.properties';
\ No newline at end of file
diff --git a/dml-examples/MediaStore/HelloWorldExample/DQL-Queries/DMLListEntitiesQuery.dql b/dml-examples/HelloWorldExample/DQL-Queries/DMLListEntitiesQuery.dql
similarity index 100%
rename from dml-examples/MediaStore/HelloWorldExample/DQL-Queries/DMLListEntitiesQuery.dql
rename to dml-examples/HelloWorldExample/DQL-Queries/DMLListEntitiesQuery.dql
diff --git a/dml-examples/MediaStore/HelloWorldExample/DQL-Queries/DMLListMetrics.dql b/dml-examples/HelloWorldExample/DQL-Queries/DMLListMetrics.dql
similarity index 100%
rename from dml-examples/MediaStore/HelloWorldExample/DQL-Queries/DMLListMetrics.dql
rename to dml-examples/HelloWorldExample/DQL-Queries/DMLListMetrics.dql
diff --git a/dml-examples/MediaStore/HelloWorldExample/DQL-Queries/DMLSelectResponseTimeSample.dql b/dml-examples/HelloWorldExample/DQL-Queries/DMLSelectResponseTimeSample.dql
similarity index 100%
rename from dml-examples/MediaStore/HelloWorldExample/DQL-Queries/DMLSelectResponseTimeSample.dql
rename to dml-examples/HelloWorldExample/DQL-Queries/DMLSelectResponseTimeSample.dql
diff --git a/dml-examples/MediaStore/HelloWorldExample/DQL-Queries/SLA_cpu.dql b/dml-examples/HelloWorldExample/DQL-Queries/SLA_cpu.dql
similarity index 100%
rename from dml-examples/MediaStore/HelloWorldExample/DQL-Queries/SLA_cpu.dql
rename to dml-examples/HelloWorldExample/DQL-Queries/SLA_cpu.dql
diff --git a/dml-examples/MediaStore/HelloWorldExample/DQL-Queries/SLA_responseTime.dql b/dml-examples/HelloWorldExample/DQL-Queries/SLA_responseTime.dql
similarity index 100%
rename from dml-examples/MediaStore/HelloWorldExample/DQL-Queries/SLA_responseTime.dql
rename to dml-examples/HelloWorldExample/DQL-Queries/SLA_responseTime.dql
diff --git a/dml-examples/CS-SyntheticComponents/DQL-Queries/minmodel.properties b/dml-examples/HelloWorldExample/DQL-Queries/minmodel.properties
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DQL-Queries/minmodel.properties
rename to dml-examples/HelloWorldExample/DQL-Queries/minmodel.properties
diff --git a/dml-examples/MediaStore/HelloWorldExample/DQL-Queries/report.txt b/dml-examples/HelloWorldExample/DQL-Queries/report.txt
similarity index 100%
rename from dml-examples/MediaStore/HelloWorldExample/DQL-Queries/report.txt
rename to dml-examples/HelloWorldExample/DQL-Queries/report.txt
diff --git a/dml-examples/CS-SyntheticComponents/README b/dml-examples/HelloWorldExample/README
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/README
rename to dml-examples/HelloWorldExample/README
diff --git a/dml-examples/MediaStore/DML-Model/default.usageprofile b/dml-examples/MediaStore/DML-Model/default.usageprofile
index 7a18bfc..f38fe55 100644
--- a/dml-examples/MediaStore/DML-Model/default.usageprofile
+++ b/dml-examples/MediaStore/DML-Model/default.usageprofile
@@ -53,10 +53,10 @@
</branchingProbabilities>
</actions>
</scenarioBehavior>
- <workloadType xsi:type="usageprofile:OpenWorkloadType">
- <interArrivalTime>
- <probFunction xsi:type="functions:ExponentialDistribution" rate="2"/>
- </interArrivalTime>
+ <workloadType xsi:type="usageprofile:ClosedWorkloadType" population="1">
+ <thinkTime>
+ <probFunction xsi:type="functions:DoubleLiteral" value="1E-29"/>
+ </thinkTime>
</workloadType>
</usageScenarios>
</usageprofile:UsageProfile>
diff --git a/dml-examples/CS-PetClinic/dml/extracted.deployment b/dml-examples/PetClinic/dml/extracted.deployment
similarity index 100%
rename from dml-examples/CS-PetClinic/dml/extracted.deployment
rename to dml-examples/PetClinic/dml/extracted.deployment
diff --git a/dml-examples/CS-PetClinic/dml/extracted.repository b/dml-examples/PetClinic/dml/extracted.repository
similarity index 100%
rename from dml-examples/CS-PetClinic/dml/extracted.repository
rename to dml-examples/PetClinic/dml/extracted.repository
diff --git a/dml-examples/CS-PetClinic/dml/extracted.resourcelandscape b/dml-examples/PetClinic/dml/extracted.resourcelandscape
similarity index 100%
rename from dml-examples/CS-PetClinic/dml/extracted.resourcelandscape
rename to dml-examples/PetClinic/dml/extracted.resourcelandscape
diff --git a/dml-examples/CS-PetClinic/dml/extracted.system b/dml-examples/PetClinic/dml/extracted.system
similarity index 100%
rename from dml-examples/CS-PetClinic/dml/extracted.system
rename to dml-examples/PetClinic/dml/extracted.system
diff --git a/dml-examples/CS-PetClinic/dml/open.usageprofile b/dml-examples/PetClinic/dml/open.usageprofile
similarity index 100%
rename from dml-examples/CS-PetClinic/dml/open.usageprofile
rename to dml-examples/PetClinic/dml/open.usageprofile
diff --git a/dml-examples/CS-PetClinic/queries/BoundsAnalysis.dql b/dml-examples/PetClinic/queries/BoundsAnalysis.dql
similarity index 100%
rename from dml-examples/CS-PetClinic/queries/BoundsAnalysis.dql
rename to dml-examples/PetClinic/queries/BoundsAnalysis.dql
diff --git a/dml-examples/CS-PetClinic/queries/BoundsAnalysisComparison.dql b/dml-examples/PetClinic/queries/BoundsAnalysisComparison.dql
similarity index 100%
rename from dml-examples/CS-PetClinic/queries/BoundsAnalysisComparison.dql
rename to dml-examples/PetClinic/queries/BoundsAnalysisComparison.dql
diff --git a/dml-examples/PetClinic/queries/extracted.properties b/dml-examples/PetClinic/queries/extracted.properties
new file mode 100644
index 0000000..4c61fb8
--- /dev/null
+++ b/dml-examples/PetClinic/queries/extracted.properties
@@ -0,0 +1,3 @@
+## Model Instance
+dml.files.usageprofile=/../dml/open.usageprofile
+dml.files.deployment=/../dml/extracted.deployment
\ No newline at end of file
diff --git a/dml-examples/CS-PetClinic/queries/list_entities.dql b/dml-examples/PetClinic/queries/list_entities.dql
similarity index 100%
rename from dml-examples/CS-PetClinic/queries/list_entities.dql
rename to dml-examples/PetClinic/queries/list_entities.dql
diff --git a/dml-examples/CS-PetClinic/queries/list_metrics.dql b/dml-examples/PetClinic/queries/list_metrics.dql
similarity index 100%
rename from dml-examples/CS-PetClinic/queries/list_metrics.dql
rename to dml-examples/PetClinic/queries/list_metrics.dql
diff --git a/dml-examples/CS-PetClinic/queries/select_cpu_utilization_avg.dql b/dml-examples/PetClinic/queries/select_cpu_utilization_avg.dql
similarity index 100%
rename from dml-examples/CS-PetClinic/queries/select_cpu_utilization_avg.dql
rename to dml-examples/PetClinic/queries/select_cpu_utilization_avg.dql
diff --git a/dml-examples/CS-PetClinic/queries/select_responsetime_avg.dql b/dml-examples/PetClinic/queries/select_responsetime_avg.dql
similarity index 100%
rename from dml-examples/CS-PetClinic/queries/select_responsetime_avg.dql
rename to dml-examples/PetClinic/queries/select_responsetime_avg.dql
diff --git a/dml-examples/CS-PetClinic/queries/select_responsetime_sample.dql b/dml-examples/PetClinic/queries/select_responsetime_sample.dql
similarity index 100%
rename from dml-examples/CS-PetClinic/queries/select_responsetime_sample.dql
rename to dml-examples/PetClinic/queries/select_responsetime_sample.dql
diff --git a/dml-examples/CS-SPECjEnterprise2010/DML-Model/specjent2010.deployment b/dml-examples/SPECjEnterprise2010/DML-Model/specjent2010.deployment
similarity index 100%
rename from dml-examples/CS-SPECjEnterprise2010/DML-Model/specjent2010.deployment
rename to dml-examples/SPECjEnterprise2010/DML-Model/specjent2010.deployment
diff --git a/dml-examples/CS-SPECjEnterprise2010/DML-Model/specjent2010.repository b/dml-examples/SPECjEnterprise2010/DML-Model/specjent2010.repository
similarity index 95%
rename from dml-examples/CS-SPECjEnterprise2010/DML-Model/specjent2010.repository
rename to dml-examples/SPECjEnterprise2010/DML-Model/specjent2010.repository
index 1834e4d..c7baf70 100644
--- a/dml-examples/CS-SPECjEnterprise2010/DML-Model/specjent2010.repository
+++ b/dml-examples/SPECjEnterprise2010/DML-Model/specjent2010.repository
@@ -111,7 +111,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -135,7 +135,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -193,8 +193,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.456905844308011" value="33"/>
- <items probability="0.543094155691989" value="34"/>
+ <items value="33" probability="0.45690584430801096"/>
+ <items value="34" probability="0.543094155691989"/>
</samples>
</probFunction>
</explicitDescription>
@@ -210,7 +210,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -226,8 +226,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.9946727906141124" value="10"/>
- <items probability="0.0053272093858876" value="11"/>
+ <items value="10" probability="0.9946727906141124"/>
+ <items value="11" probability="0.005327209385887599"/>
</samples>
</probFunction>
</explicitDescription>
@@ -243,8 +243,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.9081876552467545" value="0"/>
- <items probability="0.0918123447532455" value="1"/>
+ <items value="0" probability="0.9081876552467545"/>
+ <items value="1" probability="0.09181234475324551"/>
</samples>
</probFunction>
</explicitDescription>
@@ -272,7 +272,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -296,8 +296,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.0000312514649128" value="4"/>
- <items probability="0.9999687485350872" value="5"/>
+ <items value="4" probability="0.000031251464912784854"/>
+ <items value="5" probability="0.9999687485350872"/>
</samples>
</probFunction>
</explicitDescription>
@@ -333,8 +333,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.9993671825561137" value="3"/>
- <items probability="0.0006328174438863" value="4"/>
+ <items value="3" probability="0.9993671825561137"/>
+ <items value="4" probability="0.0006328174438863243"/>
</samples>
</probFunction>
</explicitDescription>
@@ -370,8 +370,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.5782959233884704" value="2"/>
- <items probability="0.4217040766115296" value="3"/>
+ <items value="2" probability="0.5782959233884704"/>
+ <items value="3" probability="0.42170407661152964"/>
</samples>
</probFunction>
</explicitDescription>
@@ -399,8 +399,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.0000126133625964" value="0"/>
- <items probability="0.9999873866374036" value="1"/>
+ <items value="0" probability="0.000012613362596392008"/>
+ <items value="1" probability="0.9999873866374036"/>
</samples>
</probFunction>
</explicitDescription>
@@ -424,8 +424,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.1937034093919152" value="33"/>
- <items probability="0.8062965906080848" value="34"/>
+ <items value="33" probability="0.19370340939191522"/>
+ <items value="34" probability="0.8062965906080848"/>
</samples>
</probFunction>
</explicitDescription>
@@ -441,8 +441,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.9701946241848614" value="10"/>
- <items probability="0.0298053758151386" value="11"/>
+ <items value="10" probability="0.9701946241848614"/>
+ <items value="11" probability="0.029805375815138646"/>
</samples>
</probFunction>
</explicitDescription>
@@ -458,8 +458,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.8200073157503058" value="0"/>
- <items probability="0.1799926842496942" value="1"/>
+ <items value="0" probability="0.8200073157503058"/>
+ <items value="1" probability="0.17999268424969417"/>
</samples>
</probFunction>
</explicitDescription>
@@ -487,7 +487,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -511,8 +511,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.963766653209527" value="4"/>
- <items probability="0.036233346790473" value="5"/>
+ <items value="4" probability="0.963766653209527"/>
+ <items value="5" probability="0.036233346790472964"/>
</samples>
</probFunction>
</explicitDescription>
@@ -528,8 +528,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.807251715785224" value="0"/>
- <items probability="0.192748284214776" value="1"/>
+ <items value="0" probability="0.807251715785224"/>
+ <items value="1" probability="0.19274828421477597"/>
</samples>
</probFunction>
</explicitDescription>
@@ -561,7 +561,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -577,8 +577,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.0014389430309374" value="1"/>
- <items probability="0.9985610569690626" value="2"/>
+ <items value="1" probability="0.0014389430309373896"/>
+ <items value="2" probability="0.9985610569690626"/>
</samples>
</probFunction>
</explicitDescription>
@@ -594,8 +594,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.0007194715154687" value="0"/>
- <items probability="0.9992805284845313" value="1"/>
+ <items value="0" probability="0.0007194715154686948"/>
+ <items value="1" probability="0.9992805284845313"/>
</samples>
</probFunction>
</explicitDescription>
@@ -627,8 +627,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.2045745654162854" value="2"/>
- <items probability="0.7954254345837146" value="3"/>
+ <items value="2" probability="0.20457456541628538"/>
+ <items value="3" probability="0.7954254345837146"/>
</samples>
</probFunction>
</explicitDescription>
@@ -660,8 +660,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.9998437524413681" value="1"/>
- <items probability="0.0001562475586319" value="2"/>
+ <items value="1" probability="0.9998437524413681"/>
+ <items value="2" probability="0.00015624755863186124"/>
</samples>
</probFunction>
</explicitDescription>
@@ -689,8 +689,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.9999843740233765" value="1"/>
- <items probability="0.0000156259766235" value="2"/>
+ <items value="1" probability="0.9999843740233765"/>
+ <items value="2" probability="0.000015625976623523385"/>
</samples>
</probFunction>
</explicitDescription>
@@ -718,7 +718,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -758,8 +758,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.0446085239128764" value="0"/>
- <items probability="0.9553914760871236" value="1"/>
+ <items value="0" probability="0.0446085239128764"/>
+ <items value="1" probability="0.9553914760871236"/>
</samples>
</probFunction>
</explicitDescription>
@@ -795,8 +795,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.0355377370739479" value="0"/>
- <items probability="0.9644622629260521" value="1"/>
+ <items value="0" probability="0.03553773707394792"/>
+ <items value="1" probability="0.9644622629260521"/>
</samples>
</probFunction>
</explicitDescription>
@@ -832,8 +832,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.103501622519055" value="1"/>
- <items probability="0.896498377480945" value="2"/>
+ <items value="1" probability="0.10350162251905504"/>
+ <items value="2" probability="0.896498377480945"/>
</samples>
</probFunction>
</explicitDescription>
@@ -866,7 +866,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -882,7 +882,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -930,7 +930,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -958,7 +958,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -999,8 +999,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.5298674214211232" value="16"/>
- <items probability="0.4701325785788768" value="17"/>
+ <items value="16" probability="0.5298674214211232"/>
+ <items value="17" probability="0.4701325785788768"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1036,7 +1036,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="0"/>
+ <items value="0" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1064,8 +1064,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.9999622669987172" value="1"/>
- <items probability="0.0000377330012828" value="2"/>
+ <items value="1" probability="0.9999622669987172"/>
+ <items value="2" probability="0.000037733001282846956"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1089,8 +1089,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.6775337710361473" value="7"/>
- <items probability="0.3224662289638527" value="8"/>
+ <items value="7" probability="0.6775337710361473"/>
+ <items value="8" probability="0.3224662289638527"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1131,8 +1131,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.6727083126427649" value="0"/>
- <items probability="0.3272916873572351" value="1"/>
+ <items value="0" probability="0.6727083126427649"/>
+ <items value="1" probability="0.32729168735723513"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1150,8 +1150,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.75" value="1"/>
- <items probability="0.25" value="2"/>
+ <items value="1" probability="0.75"/>
+ <items value="2" probability="0.25"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1195,7 +1195,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1219,7 +1219,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1243,7 +1243,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1279,7 +1279,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1303,7 +1303,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1339,8 +1339,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.8076674574933062" value="0"/>
- <items probability="0.1923325425066938" value="1"/>
+ <items value="0" probability="0.8076674574933062"/>
+ <items value="1" probability="0.19233254250669385"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1364,7 +1364,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1388,7 +1388,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1412,7 +1412,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1436,8 +1436,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.3787158902455257" value="0"/>
- <items probability="0.6212841097544743" value="1"/>
+ <items value="0" probability="0.37871589024552565"/>
+ <items value="1" probability="0.6212841097544743"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1461,8 +1461,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.8136160809922256" value="0"/>
- <items probability="0.1863839190077744" value="1"/>
+ <items value="0" probability="0.8136160809922256"/>
+ <items value="1" probability="0.1863839190077744"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1498,7 +1498,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1534,7 +1534,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1558,7 +1558,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1582,7 +1582,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1642,8 +1642,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.9999953968597377" value="1"/>
- <items probability="0.0000046031402623" value="2"/>
+ <items value="1" probability="0.9999953968597377"/>
+ <items value="2" probability="0.000004603140262293692"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1667,7 +1667,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1715,7 +1715,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1751,7 +1751,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1787,7 +1787,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1811,7 +1811,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1827,7 +1827,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1896,7 +1896,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1936,8 +1936,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.0707831325301207" value="9"/>
- <items probability="0.9292168674698793" value="10"/>
+ <items value="9" probability="0.0707831325301207"/>
+ <items value="10" probability="0.9292168674698793"/>
</samples>
</probFunction>
</explicitDescription>
@@ -1973,8 +1973,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.3102570591320362" value="4"/>
- <items probability="0.6897429408679638" value="5"/>
+ <items value="4" probability="0.31025705913203616"/>
+ <items value="5" probability="0.6897429408679638"/>
</samples>
</probFunction>
</explicitDescription>
@@ -2010,8 +2010,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.1308250738013257" value="4"/>
- <items probability="0.8691749261986743" value="5"/>
+ <items value="4" probability="0.1308250738013257"/>
+ <items value="5" probability="0.8691749261986743"/>
</samples>
</probFunction>
</explicitDescription>
@@ -2047,8 +2047,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.4155155144137108" value="12"/>
- <items probability="0.5844844855862892" value="13"/>
+ <items value="12" probability="0.4155155144137108"/>
+ <items value="13" probability="0.5844844855862892"/>
</samples>
</probFunction>
</explicitDescription>
@@ -2084,8 +2084,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.9295998586697287" value="2"/>
- <items probability="0.0704001413302713" value="3"/>
+ <items value="2" probability="0.9295998586697287"/>
+ <items value="3" probability="0.07040014133027128"/>
</samples>
</probFunction>
</explicitDescription>
@@ -2139,8 +2139,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.4900212429133903" value="5"/>
- <items probability="0.5099787570866097" value="6"/>
+ <items value="5" probability="0.49002124291339033"/>
+ <items value="6" probability="0.5099787570866097"/>
</samples>
</probFunction>
</explicitDescription>
@@ -2176,8 +2176,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.9067691011679639" value="1"/>
- <items probability="0.0932308988320361" value="2"/>
+ <items value="1" probability="0.9067691011679639"/>
+ <items value="2" probability="0.09323089883203606"/>
</samples>
</probFunction>
</explicitDescription>
@@ -2213,8 +2213,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.9973997713274074" value="1"/>
- <items probability="0.0026002286725926" value="2"/>
+ <items value="1" probability="0.9973997713274074"/>
+ <items value="2" probability="0.002600228672592575"/>
</samples>
</probFunction>
</explicitDescription>
@@ -2238,7 +2238,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -2262,8 +2262,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.7218492973850186" value="13"/>
- <items probability="0.2781507026149814" value="14"/>
+ <items value="13" probability="0.7218492973850186"/>
+ <items value="14" probability="0.2781507026149814"/>
</samples>
</probFunction>
</explicitDescription>
@@ -2287,8 +2287,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.4493416442297052" value="0"/>
- <items probability="0.5506583557702948" value="1"/>
+ <items value="0" probability="0.44934164422970524"/>
+ <items value="1" probability="0.5506583557702948"/>
</samples>
</probFunction>
</explicitDescription>
@@ -2304,8 +2304,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.8992180872644119" value="0"/>
- <items probability="0.1007819127355881" value="1"/>
+ <items value="0" probability="0.8992180872644119"/>
+ <items value="1" probability="0.10078191273558812"/>
</samples>
</probFunction>
</explicitDescription>
@@ -2341,8 +2341,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.2497381513485202" value="10"/>
- <items probability="0.7502618486514798" value="11"/>
+ <items value="10" probability="0.24973815134852018"/>
+ <items value="11" probability="0.7502618486514798"/>
</samples>
</probFunction>
</explicitDescription>
@@ -2378,8 +2378,8 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.6952871072589382" value="19"/>
- <items probability="0.3047128927410618" value="20"/>
+ <items value="19" probability="0.6952871072589382"/>
+ <items value="20" probability="0.30471289274106184"/>
</samples>
</probFunction>
</explicitDescription>
@@ -2419,7 +2419,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -2491,7 +2491,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
@@ -2527,7 +2527,7 @@
<explicitDescription>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="1"/>
+ <items value="1" probability="1.0"/>
</samples>
</probFunction>
</explicitDescription>
diff --git a/dml-examples/CS-SPECjEnterprise2010/DML-Model/specjent2010.resourcelandscape b/dml-examples/SPECjEnterprise2010/DML-Model/specjent2010.resourcelandscape
similarity index 100%
rename from dml-examples/CS-SPECjEnterprise2010/DML-Model/specjent2010.resourcelandscape
rename to dml-examples/SPECjEnterprise2010/DML-Model/specjent2010.resourcelandscape
diff --git a/dml-examples/CS-SPECjEnterprise2010/DML-Model/specjent2010.system b/dml-examples/SPECjEnterprise2010/DML-Model/specjent2010.system
similarity index 100%
rename from dml-examples/CS-SPECjEnterprise2010/DML-Model/specjent2010.system
rename to dml-examples/SPECjEnterprise2010/DML-Model/specjent2010.system
diff --git a/dml-examples/CS-SPECjEnterprise2010/DML-Model/specjent2010.usageprofile b/dml-examples/SPECjEnterprise2010/DML-Model/specjent2010.usageprofile
similarity index 90%
rename from dml-examples/CS-SPECjEnterprise2010/DML-Model/specjent2010.usageprofile
rename to dml-examples/SPECjEnterprise2010/DML-Model/specjent2010.usageprofile
index 54546fe..492337a 100644
--- a/dml-examples/CS-SPECjEnterprise2010/DML-Model/specjent2010.usageprofile
+++ b/dml-examples/SPECjEnterprise2010/DML-Model/specjent2010.usageprofile
@@ -16,8 +16,8 @@
<branchingProbabilities>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:EnumSampleList">
- <items probability="0.0056" value="Branch"/>
- <items probability="0.9944" value="Skip"/>
+ <items value="Branch" probability="0.0056"/>
+ <items value="Skip" probability="0.9944"/>
</samples>
</probFunction>
</branchingProbabilities>
@@ -36,11 +36,11 @@
<loopIterationCount>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.2" value="1"/>
- <items probability="0.2" value="2"/>
- <items probability="0.2" value="3"/>
- <items probability="0.2" value="4"/>
- <items probability="0.2" value="5"/>
+ <items value="1" probability="0.2"/>
+ <items value="2" probability="0.2"/>
+ <items value="3" probability="0.2"/>
+ <items value="4" probability="0.2"/>
+ <items value="5" probability="0.2"/>
</samples>
</probFunction>
</loopIterationCount>
@@ -70,11 +70,11 @@
<loopIterationCount>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.2" value="1"/>
- <items probability="0.2" value="2"/>
- <items probability="0.2" value="3"/>
- <items probability="0.2" value="4"/>
- <items probability="0.2" value="5"/>
+ <items value="1" probability="0.2"/>
+ <items value="2" probability="0.2"/>
+ <items value="3" probability="0.2"/>
+ <items value="4" probability="0.2"/>
+ <items value="5" probability="0.2"/>
</samples>
</probFunction>
</loopIterationCount>
@@ -95,7 +95,7 @@
<loopIterationCount>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="2"/>
+ <items value="2" probability="1.0"/>
</samples>
</probFunction>
</loopIterationCount>
@@ -104,9 +104,9 @@
<branchingProbabilities>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:EnumSampleList">
- <items probability="0.5" value="CHECKOUT_ENTIRE_CART_PERCENTAGE"/>
- <items probability="0.4" value="REFILL_CART"/>
- <items probability="0.1" value="REMOVE_ITEMS"/>
+ <items value="CHECKOUT_ENTIRE_CART_PERCENTAGE" probability="0.5"/>
+ <items value="REFILL_CART" probability="0.4"/>
+ <items value="REMOVE_ITEMS" probability="0.1"/>
</samples>
</probFunction>
</branchingProbabilities>
@@ -135,8 +135,8 @@
<branchingProbabilities>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:EnumSampleList">
- <items probability="0.5" value="DEFERRED_ORDER_PERCENTAGE"/>
- <items probability="0.5" value="Not DEFERRED_ORDER_PERCENTAGE"/>
+ <items value="DEFERRED_ORDER_PERCENTAGE" probability="0.5"/>
+ <items value="Not DEFERRED_ORDER_PERCENTAGE" probability="0.5"/>
</samples>
</probFunction>
</branchingProbabilities>
@@ -145,8 +145,8 @@
<branchingProbabilities>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:EnumSampleList">
- <items probability="0.1" value="LARDE_ORDER_PERCENTAGE"/>
- <items probability="0.9" value="Not LARDE_ORDER_PERCENTAGE"/>
+ <items value="LARDE_ORDER_PERCENTAGE" probability="0.1"/>
+ <items value="Not LARDE_ORDER_PERCENTAGE" probability="0.9"/>
</samples>
</probFunction>
</branchingProbabilities>
@@ -166,8 +166,8 @@
<branchingProbabilities>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:EnumSampleList">
- <items probability="0.0056" value="Branch"/>
- <items probability="0.9944" value="Skip"/>
+ <items value="Branch" probability="0.0056"/>
+ <items value="Skip" probability="0.9944"/>
</samples>
</probFunction>
</branchingProbabilities>
@@ -192,8 +192,8 @@
<branchingProbabilities>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:EnumSampleList">
- <items probability="0.0056" value="Branch"/>
- <items probability="0.9944" value="Skip"/>
+ <items value="Branch" probability="0.0056"/>
+ <items value="Skip" probability="0.9944"/>
</samples>
</probFunction>
</branchingProbabilities>
@@ -213,8 +213,8 @@
<branchingProbabilities>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:EnumSampleList">
- <items probability="0.41" value="Cancel Order"/>
- <items probability="0.59" value="No Cancel Order"/>
+ <items value="Cancel Order" probability="0.41"/>
+ <items value="No Cancel Order" probability="0.59"/>
</samples>
</probFunction>
</branchingProbabilities>
@@ -233,8 +233,8 @@
<loopIterationCount>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="0.33" value="1"/>
- <items probability="0.67" value="2"/>
+ <items value="1" probability="0.33"/>
+ <items value="2" probability="0.67"/>
</samples>
</probFunction>
</loopIterationCount>
@@ -254,8 +254,8 @@
<branchingProbabilities>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:EnumSampleList">
- <items probability="0.0056" value="Branch"/>
- <items probability="0.9944" value="Skip"/>
+ <items value="Branch" probability="0.0056"/>
+ <items value="Skip" probability="0.9944"/>
</samples>
</probFunction>
</branchingProbabilities>
@@ -280,8 +280,8 @@
<branchingProbabilities>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:EnumSampleList">
- <items probability="0.0056" value="Branch"/>
- <items probability="0.9944" value="Skip"/>
+ <items value="Branch" probability="0.0056"/>
+ <items value="Skip" probability="0.9944"/>
</samples>
</probFunction>
</branchingProbabilities>
@@ -307,8 +307,8 @@
<branchingProbabilities>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:EnumSampleList">
- <items probability="0.3" value="backwards"/>
- <items probability="0.7" value="no backwards"/>
+ <items value="backwards" probability="0.3"/>
+ <items value="no backwards" probability="0.7"/>
</samples>
</probFunction>
</branchingProbabilities>
@@ -317,7 +317,7 @@
<loopIterationCount>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:IntSampleList">
- <items probability="1.0" value="10"/>
+ <items value="10" probability="1.0"/>
</samples>
</probFunction>
</loopIterationCount>
@@ -337,8 +337,8 @@
<branchingProbabilities>
<probFunction xsi:type="functions:ProbabilityMassFunction">
<samples xsi:type="functions:EnumSampleList">
- <items probability="0.0045" value="Branch"/>
- <items probability="0.9955" value="Skip"/>
+ <items value="Branch" probability="0.0056"/>
+ <items value="Skip" probability="0.9955"/>
</samples>
</probFunction>
</branchingProbabilities>
diff --git a/dml-examples/CS-SPECjEnterprise2010/DQL-Queries/RuntimeHistogram-Queries/browse.dql b/dml-examples/SPECjEnterprise2010/DQL-Queries/RuntimeHistogram-Queries/browse.dql
similarity index 100%
rename from dml-examples/CS-SPECjEnterprise2010/DQL-Queries/RuntimeHistogram-Queries/browse.dql
rename to dml-examples/SPECjEnterprise2010/DQL-Queries/RuntimeHistogram-Queries/browse.dql
diff --git a/dml-examples/CS-SPECjEnterprise2010/DQL-Queries/RuntimeHistogram-Queries/manage.dql b/dml-examples/SPECjEnterprise2010/DQL-Queries/RuntimeHistogram-Queries/manage.dql
similarity index 100%
rename from dml-examples/CS-SPECjEnterprise2010/DQL-Queries/RuntimeHistogram-Queries/manage.dql
rename to dml-examples/SPECjEnterprise2010/DQL-Queries/RuntimeHistogram-Queries/manage.dql
diff --git a/dml-examples/CS-SPECjEnterprise2010/DQL-Queries/RuntimeHistogram-Queries/mfgejb.dql b/dml-examples/SPECjEnterprise2010/DQL-Queries/RuntimeHistogram-Queries/mfgejb.dql
similarity index 100%
rename from dml-examples/CS-SPECjEnterprise2010/DQL-Queries/RuntimeHistogram-Queries/mfgejb.dql
rename to dml-examples/SPECjEnterprise2010/DQL-Queries/RuntimeHistogram-Queries/mfgejb.dql
diff --git a/dml-examples/CS-SPECjEnterprise2010/DQL-Queries/RuntimeHistogram-Queries/mfgws.dql b/dml-examples/SPECjEnterprise2010/DQL-Queries/RuntimeHistogram-Queries/mfgws.dql
similarity index 100%
rename from dml-examples/CS-SPECjEnterprise2010/DQL-Queries/RuntimeHistogram-Queries/mfgws.dql
rename to dml-examples/SPECjEnterprise2010/DQL-Queries/RuntimeHistogram-Queries/mfgws.dql
diff --git a/dml-examples/CS-SPECjEnterprise2010/DQL-Queries/RuntimeHistogram-Queries/purchase.dql b/dml-examples/SPECjEnterprise2010/DQL-Queries/RuntimeHistogram-Queries/purchase.dql
similarity index 100%
rename from dml-examples/CS-SPECjEnterprise2010/DQL-Queries/RuntimeHistogram-Queries/purchase.dql
rename to dml-examples/SPECjEnterprise2010/DQL-Queries/RuntimeHistogram-Queries/purchase.dql
diff --git a/dml-examples/CS-SPECjEnterprise2010/DQL-Queries/RuntimeSample-Queries/browse.dql b/dml-examples/SPECjEnterprise2010/DQL-Queries/RuntimeSample-Queries/browse.dql
similarity index 100%
rename from dml-examples/CS-SPECjEnterprise2010/DQL-Queries/RuntimeSample-Queries/browse.dql
rename to dml-examples/SPECjEnterprise2010/DQL-Queries/RuntimeSample-Queries/browse.dql
diff --git a/dml-examples/CS-SPECjEnterprise2010/DQL-Queries/RuntimeSample-Queries/manage.dql b/dml-examples/SPECjEnterprise2010/DQL-Queries/RuntimeSample-Queries/manage.dql
similarity index 100%
rename from dml-examples/CS-SPECjEnterprise2010/DQL-Queries/RuntimeSample-Queries/manage.dql
rename to dml-examples/SPECjEnterprise2010/DQL-Queries/RuntimeSample-Queries/manage.dql
diff --git a/dml-examples/CS-SPECjEnterprise2010/DQL-Queries/RuntimeSample-Queries/mfgejb.dql b/dml-examples/SPECjEnterprise2010/DQL-Queries/RuntimeSample-Queries/mfgejb.dql
similarity index 100%
rename from dml-examples/CS-SPECjEnterprise2010/DQL-Queries/RuntimeSample-Queries/mfgejb.dql
rename to dml-examples/SPECjEnterprise2010/DQL-Queries/RuntimeSample-Queries/mfgejb.dql
diff --git a/dml-examples/CS-SPECjEnterprise2010/DQL-Queries/RuntimeSample-Queries/mfgws.dql b/dml-examples/SPECjEnterprise2010/DQL-Queries/RuntimeSample-Queries/mfgws.dql
similarity index 100%
rename from dml-examples/CS-SPECjEnterprise2010/DQL-Queries/RuntimeSample-Queries/mfgws.dql
rename to dml-examples/SPECjEnterprise2010/DQL-Queries/RuntimeSample-Queries/mfgws.dql
diff --git a/dml-examples/CS-SPECjEnterprise2010/DQL-Queries/RuntimeSample-Queries/purchase.dql b/dml-examples/SPECjEnterprise2010/DQL-Queries/RuntimeSample-Queries/purchase.dql
similarity index 100%
rename from dml-examples/CS-SPECjEnterprise2010/DQL-Queries/RuntimeSample-Queries/purchase.dql
rename to dml-examples/SPECjEnterprise2010/DQL-Queries/RuntimeSample-Queries/purchase.dql
diff --git a/dml-examples/CS-SPECjEnterprise2010/DQL-Queries/specjent2010.dql b/dml-examples/SPECjEnterprise2010/DQL-Queries/specjent2010.dql
similarity index 100%
rename from dml-examples/CS-SPECjEnterprise2010/DQL-Queries/specjent2010.dql
rename to dml-examples/SPECjEnterprise2010/DQL-Queries/specjent2010.dql
diff --git a/dml-examples/CS-SPECjEnterprise2010/DQL-Queries/specjent2010.properties b/dml-examples/SPECjEnterprise2010/DQL-Queries/specjent2010.properties
similarity index 100%
rename from dml-examples/CS-SPECjEnterprise2010/DQL-Queries/specjent2010.properties
rename to dml-examples/SPECjEnterprise2010/DQL-Queries/specjent2010.properties
diff --git a/dml-examples/CS-SPECjEnterprise2010/README b/dml-examples/SPECjEnterprise2010/README
similarity index 100%
rename from dml-examples/CS-SPECjEnterprise2010/README
rename to dml-examples/SPECjEnterprise2010/README
diff --git a/dml-examples/CS-SaaS/DML-Model/saas.deployment b/dml-examples/SaaS/DML-Model/saas.deployment
similarity index 100%
rename from dml-examples/CS-SaaS/DML-Model/saas.deployment
rename to dml-examples/SaaS/DML-Model/saas.deployment
diff --git a/dml-examples/CS-SaaS/DML-Model/saas.repository b/dml-examples/SaaS/DML-Model/saas.repository
similarity index 100%
rename from dml-examples/CS-SaaS/DML-Model/saas.repository
rename to dml-examples/SaaS/DML-Model/saas.repository
diff --git a/dml-examples/CS-SaaS/DML-Model/saas.resourcelandscape b/dml-examples/SaaS/DML-Model/saas.resourcelandscape
similarity index 100%
rename from dml-examples/CS-SaaS/DML-Model/saas.resourcelandscape
rename to dml-examples/SaaS/DML-Model/saas.resourcelandscape
diff --git a/dml-examples/CS-SaaS/DML-Model/saas.system b/dml-examples/SaaS/DML-Model/saas.system
similarity index 100%
rename from dml-examples/CS-SaaS/DML-Model/saas.system
rename to dml-examples/SaaS/DML-Model/saas.system
diff --git a/dml-examples/CS-SaaS/DML-Model/scenario1/highload.usageprofile b/dml-examples/SaaS/DML-Model/scenario1/highload.usageprofile
similarity index 100%
rename from dml-examples/CS-SaaS/DML-Model/scenario1/highload.usageprofile
rename to dml-examples/SaaS/DML-Model/scenario1/highload.usageprofile
diff --git a/dml-examples/CS-SaaS/DML-Model/scenario1/lowload.usageprofile b/dml-examples/SaaS/DML-Model/scenario1/lowload.usageprofile
similarity index 100%
rename from dml-examples/CS-SaaS/DML-Model/scenario1/lowload.usageprofile
rename to dml-examples/SaaS/DML-Model/scenario1/lowload.usageprofile
diff --git a/dml-examples/CS-SaaS/DML-Model/scenario1/mediumload.usageprofile b/dml-examples/SaaS/DML-Model/scenario1/mediumload.usageprofile
similarity index 100%
rename from dml-examples/CS-SaaS/DML-Model/scenario1/mediumload.usageprofile
rename to dml-examples/SaaS/DML-Model/scenario1/mediumload.usageprofile
diff --git a/dml-examples/CS-SaaS/DML-Model/scenario1/veryhighload.usageprofile b/dml-examples/SaaS/DML-Model/scenario1/veryhighload.usageprofile
similarity index 100%
rename from dml-examples/CS-SaaS/DML-Model/scenario1/veryhighload.usageprofile
rename to dml-examples/SaaS/DML-Model/scenario1/veryhighload.usageprofile
diff --git a/dml-examples/CS-SaaS/DML-Model/scenario2/highload.usageprofile b/dml-examples/SaaS/DML-Model/scenario2/highload.usageprofile
similarity index 100%
rename from dml-examples/CS-SaaS/DML-Model/scenario2/highload.usageprofile
rename to dml-examples/SaaS/DML-Model/scenario2/highload.usageprofile
diff --git a/dml-examples/CS-SaaS/DML-Model/scenario2/lowload.usageprofile b/dml-examples/SaaS/DML-Model/scenario2/lowload.usageprofile
similarity index 100%
rename from dml-examples/CS-SaaS/DML-Model/scenario2/lowload.usageprofile
rename to dml-examples/SaaS/DML-Model/scenario2/lowload.usageprofile
diff --git a/dml-examples/CS-SaaS/DML-Model/scenario2/mediumload.usageprofile b/dml-examples/SaaS/DML-Model/scenario2/mediumload.usageprofile
similarity index 100%
rename from dml-examples/CS-SaaS/DML-Model/scenario2/mediumload.usageprofile
rename to dml-examples/SaaS/DML-Model/scenario2/mediumload.usageprofile
diff --git a/dml-examples/CS-SaaS/DML-Model/scenario2/veryhighload.usageprofile b/dml-examples/SaaS/DML-Model/scenario2/veryhighload.usageprofile
similarity index 100%
rename from dml-examples/CS-SaaS/DML-Model/scenario2/veryhighload.usageprofile
rename to dml-examples/SaaS/DML-Model/scenario2/veryhighload.usageprofile
diff --git a/dml-examples/CS-SaaS/DML-Model/scenario3/highload.usageprofile b/dml-examples/SaaS/DML-Model/scenario3/highload.usageprofile
similarity index 100%
rename from dml-examples/CS-SaaS/DML-Model/scenario3/highload.usageprofile
rename to dml-examples/SaaS/DML-Model/scenario3/highload.usageprofile
diff --git a/dml-examples/CS-SaaS/DML-Model/scenario3/lowload.usageprofile b/dml-examples/SaaS/DML-Model/scenario3/lowload.usageprofile
similarity index 100%
rename from dml-examples/CS-SaaS/DML-Model/scenario3/lowload.usageprofile
rename to dml-examples/SaaS/DML-Model/scenario3/lowload.usageprofile
diff --git a/dml-examples/CS-SaaS/DML-Model/scenario3/mediumload.usageprofile b/dml-examples/SaaS/DML-Model/scenario3/mediumload.usageprofile
similarity index 100%
rename from dml-examples/CS-SaaS/DML-Model/scenario3/mediumload.usageprofile
rename to dml-examples/SaaS/DML-Model/scenario3/mediumload.usageprofile
diff --git a/dml-examples/CS-SaaS/DML-Model/scenario3/veryhighload.usageprofile b/dml-examples/SaaS/DML-Model/scenario3/veryhighload.usageprofile
similarity index 100%
rename from dml-examples/CS-SaaS/DML-Model/scenario3/veryhighload.usageprofile
rename to dml-examples/SaaS/DML-Model/scenario3/veryhighload.usageprofile
diff --git a/dml-examples/CS-SaaS/DML-Model/scenario4/lowhighhigh.usageprofile b/dml-examples/SaaS/DML-Model/scenario4/lowhighhigh.usageprofile
similarity index 100%
rename from dml-examples/CS-SaaS/DML-Model/scenario4/lowhighhigh.usageprofile
rename to dml-examples/SaaS/DML-Model/scenario4/lowhighhigh.usageprofile
diff --git a/dml-examples/CS-SaaS/DML-Model/scenario4/lowhighlow.usageprofile b/dml-examples/SaaS/DML-Model/scenario4/lowhighlow.usageprofile
similarity index 100%
rename from dml-examples/CS-SaaS/DML-Model/scenario4/lowhighlow.usageprofile
rename to dml-examples/SaaS/DML-Model/scenario4/lowhighlow.usageprofile
diff --git a/dml-examples/CS-SaaS/DML-Model/scenario4/lowlowhigh.usageprofile b/dml-examples/SaaS/DML-Model/scenario4/lowlowhigh.usageprofile
similarity index 100%
rename from dml-examples/CS-SaaS/DML-Model/scenario4/lowlowhigh.usageprofile
rename to dml-examples/SaaS/DML-Model/scenario4/lowlowhigh.usageprofile
diff --git a/dml-examples/CS-SaaS/DML-Model/scenario4/lowlowlow.usageprofile b/dml-examples/SaaS/DML-Model/scenario4/lowlowlow.usageprofile
similarity index 100%
rename from dml-examples/CS-SaaS/DML-Model/scenario4/lowlowlow.usageprofile
rename to dml-examples/SaaS/DML-Model/scenario4/lowlowlow.usageprofile
diff --git a/dml-examples/CS-SaaS/DML-Model/scenario4/mediummediumlow.usageprofile b/dml-examples/SaaS/DML-Model/scenario4/mediummediumlow.usageprofile
similarity index 100%
rename from dml-examples/CS-SaaS/DML-Model/scenario4/mediummediumlow.usageprofile
rename to dml-examples/SaaS/DML-Model/scenario4/mediummediumlow.usageprofile
diff --git a/dml-examples/CS-SaaS/DQL-Queries/.gitignore b/dml-examples/SaaS/DQL-Queries/.gitignore
similarity index 100%
rename from dml-examples/CS-SaaS/DQL-Queries/.gitignore
rename to dml-examples/SaaS/DQL-Queries/.gitignore
diff --git a/dml-examples/CS-SaaS/DQL-Queries/scenario1/highload.properties b/dml-examples/SaaS/DQL-Queries/scenario1/highload.properties
similarity index 100%
rename from dml-examples/CS-SaaS/DQL-Queries/scenario1/highload.properties
rename to dml-examples/SaaS/DQL-Queries/scenario1/highload.properties
diff --git a/dml-examples/CS-SaaS/DQL-Queries/scenario1/lowload.properties b/dml-examples/SaaS/DQL-Queries/scenario1/lowload.properties
similarity index 100%
rename from dml-examples/CS-SaaS/DQL-Queries/scenario1/lowload.properties
rename to dml-examples/SaaS/DQL-Queries/scenario1/lowload.properties
diff --git a/dml-examples/CS-SaaS/DQL-Queries/scenario1/mediumload.properties b/dml-examples/SaaS/DQL-Queries/scenario1/mediumload.properties
similarity index 100%
rename from dml-examples/CS-SaaS/DQL-Queries/scenario1/mediumload.properties
rename to dml-examples/SaaS/DQL-Queries/scenario1/mediumload.properties
diff --git a/dml-examples/CS-SaaS/DQL-Queries/scenario1/scenario1.dql b/dml-examples/SaaS/DQL-Queries/scenario1/scenario1.dql
similarity index 100%
rename from dml-examples/CS-SaaS/DQL-Queries/scenario1/scenario1.dql
rename to dml-examples/SaaS/DQL-Queries/scenario1/scenario1.dql
diff --git a/dml-examples/CS-SaaS/DQL-Queries/scenario1/veryhighload.properties b/dml-examples/SaaS/DQL-Queries/scenario1/veryhighload.properties
similarity index 100%
rename from dml-examples/CS-SaaS/DQL-Queries/scenario1/veryhighload.properties
rename to dml-examples/SaaS/DQL-Queries/scenario1/veryhighload.properties
diff --git a/dml-examples/CS-SaaS/DQL-Queries/scenario2/highload.properties b/dml-examples/SaaS/DQL-Queries/scenario2/highload.properties
similarity index 100%
rename from dml-examples/CS-SaaS/DQL-Queries/scenario2/highload.properties
rename to dml-examples/SaaS/DQL-Queries/scenario2/highload.properties
diff --git a/dml-examples/CS-SaaS/DQL-Queries/scenario2/lowload.properties b/dml-examples/SaaS/DQL-Queries/scenario2/lowload.properties
similarity index 100%
rename from dml-examples/CS-SaaS/DQL-Queries/scenario2/lowload.properties
rename to dml-examples/SaaS/DQL-Queries/scenario2/lowload.properties
diff --git a/dml-examples/CS-SaaS/DQL-Queries/scenario2/mediumload.properties b/dml-examples/SaaS/DQL-Queries/scenario2/mediumload.properties
similarity index 100%
rename from dml-examples/CS-SaaS/DQL-Queries/scenario2/mediumload.properties
rename to dml-examples/SaaS/DQL-Queries/scenario2/mediumload.properties
diff --git a/dml-examples/CS-SaaS/DQL-Queries/scenario2/scenario2.dql b/dml-examples/SaaS/DQL-Queries/scenario2/scenario2.dql
similarity index 100%
rename from dml-examples/CS-SaaS/DQL-Queries/scenario2/scenario2.dql
rename to dml-examples/SaaS/DQL-Queries/scenario2/scenario2.dql
diff --git a/dml-examples/CS-SaaS/DQL-Queries/scenario2/veryhighload.properties b/dml-examples/SaaS/DQL-Queries/scenario2/veryhighload.properties
similarity index 100%
rename from dml-examples/CS-SaaS/DQL-Queries/scenario2/veryhighload.properties
rename to dml-examples/SaaS/DQL-Queries/scenario2/veryhighload.properties
diff --git a/dml-examples/CS-SaaS/DQL-Queries/scenario3/highload.properties b/dml-examples/SaaS/DQL-Queries/scenario3/highload.properties
similarity index 100%
rename from dml-examples/CS-SaaS/DQL-Queries/scenario3/highload.properties
rename to dml-examples/SaaS/DQL-Queries/scenario3/highload.properties
diff --git a/dml-examples/CS-SaaS/DQL-Queries/scenario3/lowload.properties b/dml-examples/SaaS/DQL-Queries/scenario3/lowload.properties
similarity index 100%
rename from dml-examples/CS-SaaS/DQL-Queries/scenario3/lowload.properties
rename to dml-examples/SaaS/DQL-Queries/scenario3/lowload.properties
diff --git a/dml-examples/CS-SaaS/DQL-Queries/scenario3/mediumload.properties b/dml-examples/SaaS/DQL-Queries/scenario3/mediumload.properties
similarity index 100%
rename from dml-examples/CS-SaaS/DQL-Queries/scenario3/mediumload.properties
rename to dml-examples/SaaS/DQL-Queries/scenario3/mediumload.properties
diff --git a/dml-examples/CS-SaaS/DQL-Queries/scenario3/scenario3.dql b/dml-examples/SaaS/DQL-Queries/scenario3/scenario3.dql
similarity index 100%
rename from dml-examples/CS-SaaS/DQL-Queries/scenario3/scenario3.dql
rename to dml-examples/SaaS/DQL-Queries/scenario3/scenario3.dql
diff --git a/dml-examples/CS-SaaS/DQL-Queries/scenario3/veryhighload.properties b/dml-examples/SaaS/DQL-Queries/scenario3/veryhighload.properties
similarity index 100%
rename from dml-examples/CS-SaaS/DQL-Queries/scenario3/veryhighload.properties
rename to dml-examples/SaaS/DQL-Queries/scenario3/veryhighload.properties
diff --git a/dml-examples/CS-SaaS/DQL-Queries/scenario4/lowhighhigh.properties b/dml-examples/SaaS/DQL-Queries/scenario4/lowhighhigh.properties
similarity index 100%
rename from dml-examples/CS-SaaS/DQL-Queries/scenario4/lowhighhigh.properties
rename to dml-examples/SaaS/DQL-Queries/scenario4/lowhighhigh.properties
diff --git a/dml-examples/CS-SaaS/DQL-Queries/scenario4/lowhighlow.properties b/dml-examples/SaaS/DQL-Queries/scenario4/lowhighlow.properties
similarity index 100%
rename from dml-examples/CS-SaaS/DQL-Queries/scenario4/lowhighlow.properties
rename to dml-examples/SaaS/DQL-Queries/scenario4/lowhighlow.properties
diff --git a/dml-examples/CS-SaaS/DQL-Queries/scenario4/lowlowhigh.properties b/dml-examples/SaaS/DQL-Queries/scenario4/lowlowhigh.properties
similarity index 100%
rename from dml-examples/CS-SaaS/DQL-Queries/scenario4/lowlowhigh.properties
rename to dml-examples/SaaS/DQL-Queries/scenario4/lowlowhigh.properties
diff --git a/dml-examples/CS-SaaS/DQL-Queries/scenario4/lowlowlow.properties b/dml-examples/SaaS/DQL-Queries/scenario4/lowlowlow.properties
similarity index 100%
rename from dml-examples/CS-SaaS/DQL-Queries/scenario4/lowlowlow.properties
rename to dml-examples/SaaS/DQL-Queries/scenario4/lowlowlow.properties
diff --git a/dml-examples/CS-SaaS/DQL-Queries/scenario4/mediummediumlow.properties b/dml-examples/SaaS/DQL-Queries/scenario4/mediummediumlow.properties
similarity index 100%
rename from dml-examples/CS-SaaS/DQL-Queries/scenario4/mediummediumlow.properties
rename to dml-examples/SaaS/DQL-Queries/scenario4/mediummediumlow.properties
diff --git a/dml-examples/CS-SaaS/DQL-Queries/scenario4/scenario4.dql b/dml-examples/SaaS/DQL-Queries/scenario4/scenario4.dql
similarity index 100%
rename from dml-examples/CS-SaaS/DQL-Queries/scenario4/scenario4.dql
rename to dml-examples/SaaS/DQL-Queries/scenario4/scenario4.dql
diff --git a/dml-examples/CS-SaaS/README b/dml-examples/SaaS/README
similarity index 100%
rename from dml-examples/CS-SaaS/README
rename to dml-examples/SaaS/README
diff --git a/dml-examples/CS-SyntheticComponents/DML-Model/min.deployment b/dml-examples/SyntheticComponents/DML-Model/min.deployment
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DML-Model/min.deployment
rename to dml-examples/SyntheticComponents/DML-Model/min.deployment
diff --git a/dml-examples/CS-SyntheticComponents/DML-Model/min.repository b/dml-examples/SyntheticComponents/DML-Model/min.repository
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DML-Model/min.repository
rename to dml-examples/SyntheticComponents/DML-Model/min.repository
diff --git a/dml-examples/CS-SyntheticComponents/DML-Model/min.resourcelandscape b/dml-examples/SyntheticComponents/DML-Model/min.resourcelandscape
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DML-Model/min.resourcelandscape
rename to dml-examples/SyntheticComponents/DML-Model/min.resourcelandscape
diff --git a/dml-examples/CS-SyntheticComponents/DML-Model/min.system b/dml-examples/SyntheticComponents/DML-Model/min.system
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DML-Model/min.system
rename to dml-examples/SyntheticComponents/DML-Model/min.system
diff --git a/dml-examples/CS-SyntheticComponents/DML-Model/min.system.bak b/dml-examples/SyntheticComponents/DML-Model/min.system.bak
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DML-Model/min.system.bak
rename to dml-examples/SyntheticComponents/DML-Model/min.system.bak
diff --git a/dml-examples/CS-SyntheticComponents/DML-Model/min.usageprofile b/dml-examples/SyntheticComponents/DML-Model/min.usageprofile
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DML-Model/min.usageprofile
rename to dml-examples/SyntheticComponents/DML-Model/min.usageprofile
diff --git a/dml-examples/CS-SyntheticComponents/DQL-Queries/TimeAnalysis.dql b/dml-examples/SyntheticComponents/DQL-Queries/Analysis.dql
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DQL-Queries/TimeAnalysis.dql
rename to dml-examples/SyntheticComponents/DQL-Queries/Analysis.dql
diff --git a/dml-examples/CS-SyntheticComponents/DQL-Queries/Analysis_A.dql b/dml-examples/SyntheticComponents/DQL-Queries/Analysis_A.dql
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DQL-Queries/Analysis_A.dql
rename to dml-examples/SyntheticComponents/DQL-Queries/Analysis_A.dql
diff --git a/dml-examples/CS-SyntheticComponents/DQL-Queries/Analysis_B.dql b/dml-examples/SyntheticComponents/DQL-Queries/Analysis_B.dql
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DQL-Queries/Analysis_B.dql
rename to dml-examples/SyntheticComponents/DQL-Queries/Analysis_B.dql
diff --git a/dml-examples/CS-SyntheticComponents/DQL-Queries/Analysis_C.dql b/dml-examples/SyntheticComponents/DQL-Queries/Analysis_C.dql
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DQL-Queries/Analysis_C.dql
rename to dml-examples/SyntheticComponents/DQL-Queries/Analysis_C.dql
diff --git a/dml-examples/CS-SyntheticComponents/DQL-Queries/Analysis_CE.dql b/dml-examples/SyntheticComponents/DQL-Queries/Analysis_CE.dql
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DQL-Queries/Analysis_CE.dql
rename to dml-examples/SyntheticComponents/DQL-Queries/Analysis_CE.dql
diff --git a/dml-examples/CS-SyntheticComponents/DQL-Queries/Analysis_CF.dql b/dml-examples/SyntheticComponents/DQL-Queries/Analysis_CF.dql
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DQL-Queries/Analysis_CF.dql
rename to dml-examples/SyntheticComponents/DQL-Queries/Analysis_CF.dql
diff --git a/dml-examples/CS-SyntheticComponents/DQL-Queries/Analysis_CG.dql b/dml-examples/SyntheticComponents/DQL-Queries/Analysis_CG.dql
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DQL-Queries/Analysis_CG.dql
rename to dml-examples/SyntheticComponents/DQL-Queries/Analysis_CG.dql
diff --git a/dml-examples/CS-SyntheticComponents/DQL-Queries/Analysis_D.dql b/dml-examples/SyntheticComponents/DQL-Queries/Analysis_D.dql
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DQL-Queries/Analysis_D.dql
rename to dml-examples/SyntheticComponents/DQL-Queries/Analysis_D.dql
diff --git a/dml-examples/CS-SyntheticComponents/DQL-Queries/Analysis_DE.dql b/dml-examples/SyntheticComponents/DQL-Queries/Analysis_DE.dql
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DQL-Queries/Analysis_DE.dql
rename to dml-examples/SyntheticComponents/DQL-Queries/Analysis_DE.dql
diff --git a/dml-examples/CS-SyntheticComponents/DQL-Queries/Analysis_E.dql b/dml-examples/SyntheticComponents/DQL-Queries/Analysis_E.dql
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DQL-Queries/Analysis_E.dql
rename to dml-examples/SyntheticComponents/DQL-Queries/Analysis_E.dql
diff --git a/dml-examples/CS-SyntheticComponents/DQL-Queries/Analysis_F.dql b/dml-examples/SyntheticComponents/DQL-Queries/Analysis_F.dql
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DQL-Queries/Analysis_F.dql
rename to dml-examples/SyntheticComponents/DQL-Queries/Analysis_F.dql
diff --git a/dml-examples/CS-SyntheticComponents/DQL-Queries/Analysis_G.dql b/dml-examples/SyntheticComponents/DQL-Queries/Analysis_G.dql
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DQL-Queries/Analysis_G.dql
rename to dml-examples/SyntheticComponents/DQL-Queries/Analysis_G.dql
diff --git a/dml-examples/CS-SyntheticComponents/DQL-Queries/TimeAnalysis_A.dql b/dml-examples/SyntheticComponents/DQL-Queries/TimeAnalysis_A.dql
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DQL-Queries/TimeAnalysis_A.dql
rename to dml-examples/SyntheticComponents/DQL-Queries/TimeAnalysis_A.dql
diff --git a/dml-examples/CS-SyntheticComponents/DQL-Queries/TimeAnalysis_B.dql b/dml-examples/SyntheticComponents/DQL-Queries/TimeAnalysis_B.dql
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DQL-Queries/TimeAnalysis_B.dql
rename to dml-examples/SyntheticComponents/DQL-Queries/TimeAnalysis_B.dql
diff --git a/dml-examples/CS-SyntheticComponents/DQL-Queries/TimeAnalysis_C.dql b/dml-examples/SyntheticComponents/DQL-Queries/TimeAnalysis_C.dql
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DQL-Queries/TimeAnalysis_C.dql
rename to dml-examples/SyntheticComponents/DQL-Queries/TimeAnalysis_C.dql
diff --git a/dml-examples/CS-SyntheticComponents/DQL-Queries/TimeAnalysis_CE.dql b/dml-examples/SyntheticComponents/DQL-Queries/TimeAnalysis_CE.dql
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DQL-Queries/TimeAnalysis_CE.dql
rename to dml-examples/SyntheticComponents/DQL-Queries/TimeAnalysis_CE.dql
diff --git a/dml-examples/CS-SyntheticComponents/DQL-Queries/TimeAnalysis_CF.dql b/dml-examples/SyntheticComponents/DQL-Queries/TimeAnalysis_CF.dql
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DQL-Queries/TimeAnalysis_CF.dql
rename to dml-examples/SyntheticComponents/DQL-Queries/TimeAnalysis_CF.dql
diff --git a/dml-examples/CS-SyntheticComponents/DQL-Queries/TimeAnalysis_CG.dql b/dml-examples/SyntheticComponents/DQL-Queries/TimeAnalysis_CG.dql
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DQL-Queries/TimeAnalysis_CG.dql
rename to dml-examples/SyntheticComponents/DQL-Queries/TimeAnalysis_CG.dql
diff --git a/dml-examples/CS-SyntheticComponents/DQL-Queries/TimeAnalysis_D.dql b/dml-examples/SyntheticComponents/DQL-Queries/TimeAnalysis_D.dql
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DQL-Queries/TimeAnalysis_D.dql
rename to dml-examples/SyntheticComponents/DQL-Queries/TimeAnalysis_D.dql
diff --git a/dml-examples/CS-SyntheticComponents/DQL-Queries/TimeAnalysis_DE.dql b/dml-examples/SyntheticComponents/DQL-Queries/TimeAnalysis_DE.dql
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DQL-Queries/TimeAnalysis_DE.dql
rename to dml-examples/SyntheticComponents/DQL-Queries/TimeAnalysis_DE.dql
diff --git a/dml-examples/CS-SyntheticComponents/DQL-Queries/TimeAnalysis_E.dql b/dml-examples/SyntheticComponents/DQL-Queries/TimeAnalysis_E.dql
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DQL-Queries/TimeAnalysis_E.dql
rename to dml-examples/SyntheticComponents/DQL-Queries/TimeAnalysis_E.dql
diff --git a/dml-examples/CS-SyntheticComponents/DQL-Queries/TimeAnalysis_F.dql b/dml-examples/SyntheticComponents/DQL-Queries/TimeAnalysis_F.dql
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DQL-Queries/TimeAnalysis_F.dql
rename to dml-examples/SyntheticComponents/DQL-Queries/TimeAnalysis_F.dql
diff --git a/dml-examples/CS-SyntheticComponents/DQL-Queries/TimeAnalysis_G.dql b/dml-examples/SyntheticComponents/DQL-Queries/TimeAnalysis_G.dql
similarity index 100%
rename from dml-examples/CS-SyntheticComponents/DQL-Queries/TimeAnalysis_G.dql
rename to dml-examples/SyntheticComponents/DQL-Queries/TimeAnalysis_G.dql
diff --git a/dml-examples/MediaStore/HelloWorldExample/DQL-Queries/minmodel.properties b/dml-examples/SyntheticComponents/DQL-Queries/minmodel.properties
similarity index 100%
rename from dml-examples/MediaStore/HelloWorldExample/DQL-Queries/minmodel.properties
rename to dml-examples/SyntheticComponents/DQL-Queries/minmodel.properties
diff --git a/dml-examples/MediaStore/HelloWorldExample/README b/dml-examples/SyntheticComponents/README
similarity index 100%
rename from dml-examples/MediaStore/HelloWorldExample/README
rename to dml-examples/SyntheticComponents/README
--
GitLab