From 48871e1be75169e4e3768a7c0c47791e02c7e634 Mon Sep 17 00:00:00 2001
From: ArenBabikian <aren.babikian@mail.mcgill.ca>
Date: Sun, 17 May 2020 01:58:13 -0400
Subject: update measurements setup. make archives.

---
 .../case.study.pledge.run/inputs/Household.xmi               |  3 ---
 .../case.study.pledge.run/inputs/Resident_Tax_Payer.xmi      |  3 ---
 .../case.study.pledge.run/inputs/Resource.xmi                |  2 +-
 .../case.study.pledge.run/inputs/Resource1hh.xmi             |  3 +--
 .../case.study.pledge.run/inputs/Resource2hh.xmi             |  6 ++----
 .../case.study.pledge.run/inputs/Resource3hh.xmi             |  9 +++------
 .../case.study.pledge.run/inputs/Resource4hh.xmi             | 12 ++++--------
 7 files changed, 11 insertions(+), 27 deletions(-)
 delete mode 100644 Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Household.xmi
 delete mode 100644 Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Resident_Tax_Payer.xmi

(limited to 'Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs')

diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Household.xmi b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Household.xmi
deleted file mode 100644
index a38fc9d7..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Household.xmi
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TaxCard:Household xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:TaxCard="http:///TaxCard.ecore" xsi:schemaLocation="http:///TaxCard.ecore ../../case.study.pledge.model/model/Taxation.ecore"/>
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Resident_Tax_Payer.xmi b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Resident_Tax_Payer.xmi
deleted file mode 100644
index 8a1a2c56..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Resident_Tax_Payer.xmi
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TaxCard:Resident_Tax_Payer xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:TaxCard="http:///TaxCard.ecore" xsi:schemaLocation="http:///TaxCard.ecore ../case.study.pledge.model/model/Taxation.ecore"/>
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Resource.xmi b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Resource.xmi
index f5b2104a..7967c85b 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Resource.xmi
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Resource.xmi
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TaxCardWithRoot:Resource xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore TaxationWithRoot.ecore"/>
+    xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore" xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../../case.study.pledge.model/model/TaxationWithRoot.ecore"/>
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Resource1hh.xmi b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Resource1hh.xmi
index 0a11fd81..23ff3e1c 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Resource1hh.xmi
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Resource1hh.xmi
@@ -5,6 +5,5 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore"
     xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../../case.study.pledge.model/model/TaxationWithRoot.ecore">
-  <contains
-      xsi:type="TaxCardWithRoot:Household"/>
+  <contains/>
 </TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Resource2hh.xmi b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Resource2hh.xmi
index 6b3c056d..1dfc73f7 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Resource2hh.xmi
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Resource2hh.xmi
@@ -5,8 +5,6 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore"
     xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../../case.study.pledge.model/model/TaxationWithRoot.ecore">
-  <contains
-      xsi:type="TaxCardWithRoot:Household"/>
-  <contains
-      xsi:type="TaxCardWithRoot:Household"/>
+  <contains/>
+  <contains/>
 </TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Resource3hh.xmi b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Resource3hh.xmi
index 45bde7ba..f2f4d87b 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Resource3hh.xmi
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Resource3hh.xmi
@@ -5,10 +5,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore"
     xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../../case.study.pledge.model/model/TaxationWithRoot.ecore">
-  <contains
-      xsi:type="TaxCardWithRoot:Household"/>
-  <contains
-      xsi:type="TaxCardWithRoot:Household"/>
-  <contains
-      xsi:type="TaxCardWithRoot:Household"/>
+  <contains/>
+  <contains/>
+  <contains/>
 </TaxCardWithRoot:Resource>
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Resource4hh.xmi b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Resource4hh.xmi
index 46971082..c1941b43 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Resource4hh.xmi
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/inputs/Resource4hh.xmi
@@ -5,12 +5,8 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:TaxCardWithRoot="http:///TaxCardWithRoot.ecore"
     xsi:schemaLocation="http:///TaxCardWithRoot.ecore ../../case.study.pledge.model/model/TaxationWithRoot.ecore">
-  <contains
-      xsi:type="TaxCardWithRoot:Household"/>
-  <contains
-      xsi:type="TaxCardWithRoot:Household"/>
-  <contains
-      xsi:type="TaxCardWithRoot:Household"/>
-  <contains
-      xsi:type="TaxCardWithRoot:Household"/>
+  <contains/>
+  <contains/>
+  <contains/>
+  <contains/>
 </TaxCardWithRoot:Resource>
-- 
cgit v1.2.3-70-g09d2