renamed models for casestudy

fa9d3370 · Simon · 1a2b2c86 · fa9d3370 · fa9d3370 · fa9d3370
Commit fa9d3370 authored 6 years ago by Simon
--- a/dml-examples/PetClinic/dml/extracted.deployment
+++ b/dml-examples/PetClinic/dml/extracted.deployment
--- a/dml-examples/PetClinic/dml/extracted.repository
+++ b/dml-examples/PetClinic/dml/extracted.repository
--- a/dml-examples/PetClinic/dml/extracted.resourcelandscape
+++ b/dml-examples/PetClinic/dml/extracted.resourcelandscape
--- a/dml-examples/PetClinic/dml/extracted.system
+++ b/dml-examples/PetClinic/dml/extracted.system
--- a/dml-examples/PetClinic/dml/open.usageprofile
+++ b/dml-examples/PetClinic/dml/open.usageprofile
--- a/dml-examples/PetClinic/queries/BoundsAnalysis.dql
+++ b/dml-examples/PetClinic/queries/BoundsAnalysis.dql
--- a/dml-examples/PetClinic/queries/BoundsAnalysisComparison.dql
+++ b/dml-examples/PetClinic/queries/BoundsAnalysisComparison.dql
--- a/dml-examples/PetClinic/queries/extracted.properties
+++ b/dml-examples/PetClinic/queries/extracted.properties
 ## Model Instance
 dml.files.usageprofile=/../dml/open.usageprofile
 dml.files.deployment=/../dml/extracted.deployment
\ No newline at end of file
+simqpn.totalRunLength=100
\ No newline at end of file
--- a/dml-examples/PetClinic/queries/list_entities.dql
+++ b/dml-examples/PetClinic/queries/list_entities.dql
--- a/dml-examples/PetClinic/queries/list_metrics.dql
+++ b/dml-examples/PetClinic/queries/list_metrics.dql
--- a/dml-examples/PetClinic/queries/select_cpu_utilization_avg.dql
+++ b/dml-examples/PetClinic/queries/select_cpu_utilization_avg.dql
--- a/dml-examples/PetClinic/queries/select_responsetime_avg.dql
+++ b/dml-examples/PetClinic/queries/select_responsetime_avg.dql
--- a/dml-examples/PetClinic/queries/select_responsetime_sample.dql
+++ b/dml-examples/PetClinic/queries/select_responsetime_sample.dql
--- a/dml-examples/SPECjEnterprise2010/DML-Model/specjent2010.deployment
+++ b/dml-examples/SPECjEnterprise2010/DML-Model/specjent2010.deployment
--- a/dml-examples/SPECjEnterprise2010/DML-Model/specjent2010.repository
+++ b/dml-examples/SPECjEnterprise2010/DML-Model/specjent2010.repository
--- a/dml-examples/SPECjEnterprise2010/DML-Model/specjent2010.resourcelandscape
+++ b/dml-examples/SPECjEnterprise2010/DML-Model/specjent2010.resourcelandscape
--- a/dml-examples/SPECjEnterprise2010/DML-Model/specjent2010.system
+++ b/dml-examples/SPECjEnterprise2010/DML-Model/specjent2010.system
--- a/dml-examples/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 value="Branch" probability="0.0056"/>
+              <items probability="0.0056" value="Branch"/>
-              <items value="Skip" probability="0.9944"/>
+              <items probability="0.9944" value="Skip"/>
            </samples>
          </probFunction>
        </branchingProbabilities>
@@ -36,11 +36,11 @@
        <loopIterationCount>
          <probFunction xsi:type="functions:ProbabilityMassFunction">
            <samples xsi:type="functions:IntSampleList">
-              <items value="1" probability="0.2"/>
+              <items probability="0.2" value="1"/>
-              <items value="2" probability="0.2"/>
+              <items probability="0.2" value="2"/>
-              <items value="3" probability="0.2"/>
+              <items probability="0.2" value="3"/>
-              <items value="4" probability="0.2"/>
+              <items probability="0.2" value="4"/>
-              <items value="5" probability="0.2"/>
+              <items probability="0.2" value="5"/>
            </samples>
          </probFunction>
        </loopIterationCount>
@@ -70,11 +70,11 @@
            <loopIterationCount>
              <probFunction xsi:type="functions:ProbabilityMassFunction">
                <samples xsi:type="functions:IntSampleList">
-                  <items value="1" probability="0.2"/>
+                  <items probability="0.2" value="1"/>
-                  <items value="2" probability="0.2"/>
+                  <items probability="0.2" value="2"/>
-                  <items value="3" probability="0.2"/>
+                  <items probability="0.2" value="3"/>
-                  <items value="4" probability="0.2"/>
+                  <items probability="0.2" value="4"/>
-                  <items value="5" probability="0.2"/>
+                  <items probability="0.2" value="5"/>
                </samples>
              </probFunction>
            </loopIterationCount>
@@ -95,7 +95,7 @@
            <loopIterationCount>
              <probFunction xsi:type="functions:ProbabilityMassFunction">
                <samples xsi:type="functions:IntSampleList">
-                  <items value="2" probability="1.0"/>
+                  <items probability="1.0" value="2"/>
                </samples>
              </probFunction>
            </loopIterationCount>
@@ -104,9 +104,9 @@
        <branchingProbabilities>
          <probFunction xsi:type="functions:ProbabilityMassFunction">
            <samples xsi:type="functions:EnumSampleList">
-              <items value="CHECKOUT_ENTIRE_CART_PERCENTAGE" probability="0.5"/>
+              <items probability="0.5" value="CHECKOUT_ENTIRE_CART_PERCENTAGE"/>
-              <items value="REFILL_CART" probability="0.4"/>
+              <items probability="0.4" value="REFILL_CART"/>
-              <items value="REMOVE_ITEMS" probability="0.1"/>
+              <items probability="0.1" value="REMOVE_ITEMS"/>
            </samples>
          </probFunction>
        </branchingProbabilities>
@@ -135,8 +135,8 @@
            <branchingProbabilities>
              <probFunction xsi:type="functions:ProbabilityMassFunction">
                <samples xsi:type="functions:EnumSampleList">
-                  <items value="DEFERRED_ORDER_PERCENTAGE" probability="0.5"/>
+                  <items probability="0.5" value="DEFERRED_ORDER_PERCENTAGE"/>
-                  <items value="Not DEFERRED_ORDER_PERCENTAGE" probability="0.5"/>
+                  <items probability="0.5" value="Not DEFERRED_ORDER_PERCENTAGE"/>
                </samples>
              </probFunction>
            </branchingProbabilities>
@@ -145,8 +145,8 @@
        <branchingProbabilities>
          <probFunction xsi:type="functions:ProbabilityMassFunction">
            <samples xsi:type="functions:EnumSampleList">
-              <items value="LARDE_ORDER_PERCENTAGE" probability="0.1"/>
+              <items probability="0.1" value="LARDE_ORDER_PERCENTAGE"/>
-              <items value="Not LARDE_ORDER_PERCENTAGE" probability="0.9"/>
+              <items probability="0.9" value="Not LARDE_ORDER_PERCENTAGE"/>
            </samples>
          </probFunction>
        </branchingProbabilities>
@@ -166,8 +166,8 @@
        <branchingProbabilities>
          <probFunction xsi:type="functions:ProbabilityMassFunction">
            <samples xsi:type="functions:EnumSampleList">
-              <items value="Branch" probability="0.0056"/>
+              <items probability="0.0056" value="Branch"/>
-              <items value="Skip" probability="0.9944"/>
+              <items probability="0.9944" value="Skip"/>
            </samples>
          </probFunction>
        </branchingProbabilities>
@@ -192,8 +192,8 @@
        <branchingProbabilities>
          <probFunction xsi:type="functions:ProbabilityMassFunction">
            <samples xsi:type="functions:EnumSampleList">
-              <items value="Branch" probability="0.0056"/>
+              <items probability="0.0056" value="Branch"/>
-              <items value="Skip" probability="0.9944"/>
+              <items probability="0.9944" value="Skip"/>
            </samples>
          </probFunction>
        </branchingProbabilities>
@@ -213,8 +213,8 @@
        <branchingProbabilities>
          <probFunction xsi:type="functions:ProbabilityMassFunction">
            <samples xsi:type="functions:EnumSampleList">
-              <items value="Cancel Order" probability="0.41"/>
+              <items probability="0.41" value="Cancel Order"/>
-              <items value="No Cancel Order" probability="0.59"/>
+              <items probability="0.59" value="No Cancel Order"/>
            </samples>
          </probFunction>
        </branchingProbabilities>
@@ -233,8 +233,8 @@
        <loopIterationCount>
          <probFunction xsi:type="functions:ProbabilityMassFunction">
            <samples xsi:type="functions:IntSampleList">
-              <items value="1" probability="0.33"/>
+              <items probability="0.33" value="1"/>
-              <items value="2" probability="0.67"/>
+              <items probability="0.67" value="2"/>
            </samples>
          </probFunction>
        </loopIterationCount>
@@ -254,8 +254,8 @@
        <branchingProbabilities>
          <probFunction xsi:type="functions:ProbabilityMassFunction">
            <samples xsi:type="functions:EnumSampleList">
-              <items value="Branch" probability="0.0056"/>
+              <items probability="0.0056" value="Branch"/>
-              <items value="Skip" probability="0.9944"/>
+              <items probability="0.9944" value="Skip"/>
            </samples>
          </probFunction>
        </branchingProbabilities>
@@ -280,8 +280,8 @@
        <branchingProbabilities>
          <probFunction xsi:type="functions:ProbabilityMassFunction">
            <samples xsi:type="functions:EnumSampleList">
-              <items value="Branch" probability="0.0056"/>
+              <items probability="0.0056" value="Branch"/>
-              <items value="Skip" probability="0.9944"/>
+              <items probability="0.9944" value="Skip"/>
            </samples>
          </probFunction>
        </branchingProbabilities>
@@ -307,8 +307,8 @@
            <branchingProbabilities>
              <probFunction xsi:type="functions:ProbabilityMassFunction">
                <samples xsi:type="functions:EnumSampleList">
-                  <items value="backwards" probability="0.3"/>
+                  <items probability="0.3" value="backwards"/>
-                  <items value="no backwards" probability="0.7"/>
+                  <items probability="0.7" value="no backwards"/>
                </samples>
              </probFunction>
            </branchingProbabilities>
@@ -317,7 +317,7 @@
        <loopIterationCount>
          <probFunction xsi:type="functions:ProbabilityMassFunction">
            <samples xsi:type="functions:IntSampleList">
-              <items value="10" probability="1.0"/>
+              <items probability="1.0" value="10"/>
            </samples>
          </probFunction>
        </loopIterationCount>
@@ -337,8 +337,8 @@
        <branchingProbabilities>
          <probFunction xsi:type="functions:ProbabilityMassFunction">
            <samples xsi:type="functions:EnumSampleList">
-              <items value="Branch" probability="0.0056"/>
+              <items probability="0.0045" value="Branch"/>
-              <items value="Skip" probability="0.9955"/>
+              <items probability="0.9955" value="Skip"/>
            </samples>
          </probFunction>
        </branchingProbabilities>

--- a/dml-examples/SPECjEnterprise2010/DQL-Queries/RuntimeHistogram-Queries/browse.dql
+++ b/dml-examples/SPECjEnterprise2010/DQL-Queries/RuntimeHistogram-Queries/browse.dql
--- a/dml-examples/SPECjEnterprise2010/DQL-Queries/RuntimeHistogram-Queries/manage.dql
+++ b/dml-examples/SPECjEnterprise2010/DQL-Queries/RuntimeHistogram-Queries/manage.dql