diff --git a/modeling/AVATAR/CoffeeMachine_Avatar.xml b/modeling/AVATAR/CoffeeMachine_Avatar.xml
index 59918e1a5afca27b66c814b91b2e37385158bb89..0f47e68c8fc6cae922d6c72939428d885ad7cd56 100644
--- a/modeling/AVATAR/CoffeeMachine_Avatar.xml
+++ b/modeling/AVATAR/CoffeeMachine_Avatar.xml
@@ -1279,7 +1279,7 @@
<MainCode value="}"/>
<Optimized value="true" />
<considerTimingOperators value="true" />
-<Validated value="Wallet;CoffeeMachine;CoffeeButton;TeaButton;" />
+<Validated value="" />
<Ignored value="" />
<CONNECTOR type="5002" id="695" >
diff --git a/src/main/java/attacktrees/Attack.java b/src/main/java/attacktrees/Attack.java
index 4b52f290d1b8ca3eeb4b4a5d477fd8ec035d5908..cd319717423203b4e7217d5c6518a434298b161b 100755
--- a/src/main/java/attacktrees/Attack.java
+++ b/src/main/java/attacktrees/Attack.java
@@ -123,15 +123,34 @@ public class Attack extends AttackElement {
}
- public boolean canPerformAttack(int _resource, int _experience) {
+ public boolean canPerformAttack(int _resource, int _expertise) {
// Leaf attack?
if (originNode == null) {
- return (attackCost <= _resource) && (attackExperience <= _experience);
+ return (attackCost <= _resource) && (attackExperience <= _expertise);
}
// Intermediate attack. Needs to compute its resulting cost and experience
- return originNode.canPerformAttack(_resource, _experience);
+ int cost = originNode.getLowestCost(_expertise);
+ if (cost == -1) {
+ // nothing was found
+ return false;
+ } else {
+ return cost <= _resource;
+ }
+ }
+
+ public int getLowestCost(int _expertise) {
+ if (originNode == null) {
+ if (attackExperience <= _expertise) {
+ return attackCost;
+ } else {
+ return -1;
+ }
+ }
+
+ return originNode.getLowestCost(_expertise);
+
}
}
diff --git a/src/main/java/attacktrees/AttackNode.java b/src/main/java/attacktrees/AttackNode.java
index 7562dae7249965f347b3ee0fae61ee26fdbce155..fd12ae3cff2b09fc8793106b833bd9c22067279f 100755
--- a/src/main/java/attacktrees/AttackNode.java
+++ b/src/main/java/attacktrees/AttackNode.java
@@ -154,24 +154,26 @@ public abstract class AttackNode extends AttackElement {
inputValues = newInputValues;
}
- public boolean canPerformAttack(int _resource, int _experience) {
+ public int getLowestCost(int _experience) {
//TraceManager.addDev("In node: " + this.getClass());
if ((inputAttacks == null) || (inputAttacks.size() == 0)) {
- return true;
+ return -1;
}
// Built from the lower attacks. Assume all attacks are necessary
-
+ int cost = 0;
for(Attack attack: inputAttacks) {
- if (!attack.canPerformAttack(_resource, _experience)) {
- return false;
+ int ret = attack.getLowestCost(_experience);
+ if (ret == -1) {
+ return -1;
}
+ cost += ret;
}
- return true;
+ return cost;
}
}
diff --git a/src/main/java/attacktrees/ORNode.java b/src/main/java/attacktrees/ORNode.java
index 0c28a4c58bb14aadf7f09af57b6a835df0ebf4cb..ec20ff2f0cb7ca9da3c2e0ee939f30295e214686 100755
--- a/src/main/java/attacktrees/ORNode.java
+++ b/src/main/java/attacktrees/ORNode.java
@@ -58,23 +58,31 @@ public class ORNode extends BooleanNode {
type = "OR";
}
- public boolean canPerformAttack(int _resource, int _experience) {
+
+ public int getLowestCost(int _expertise) {
//TraceManager.addDev("In node: " + this.getClass());
if ((inputAttacks == null) || (inputAttacks.size() == 0)) {
- return true;
+ return -1;
}
// Built from the lower attacks. Assume all attacks are necessary
+ // We task the lowest cost;
+ int cost = Integer.MAX_VALUE;
for(Attack attack: inputAttacks) {
- if (attack.canPerformAttack(_resource, _experience)) {
- return true;
+ int ret = attack.getLowestCost(_expertise);
+ if (ret != -1) {
+ cost = Math.min(cost, ret);
}
}
- return false;
+ if (cost == Integer.MAX_VALUE) {
+ return -1; // no solution found
+ }
+
+ return cost;
}
diff --git a/src/main/java/attacktrees/XORNode.java b/src/main/java/attacktrees/XORNode.java
index db4f39b4da13c20a577572f9f7fff2d3f4d10b72..fee8350bbc0855b3434c4241ac937a1f5092d1d9 100755
--- a/src/main/java/attacktrees/XORNode.java
+++ b/src/main/java/attacktrees/XORNode.java
@@ -55,22 +55,31 @@ public class XORNode extends BooleanNode {
type = "XOR";
}
-
- public boolean canPerformAttack(int _resource, int _experience) {
+ public int getLowestCost(int _expertise) {
+
+ //TraceManager.addDev("In node: " + this.getClass());
if ((inputAttacks == null) || (inputAttacks.size() == 0)) {
- return true;
+ return -1;
}
// Built from the lower attacks. Assume all attacks are necessary
- int cpt = 0;
+
+ // We task the lowest cost;
+ int cost = Integer.MAX_VALUE;
for(Attack attack: inputAttacks) {
- if (attack.canPerformAttack(_resource, _experience)) {
- cpt ++;
+ int ret = attack.getLowestCost(_expertise);
+ if (ret != -1) {
+ cost = Math.min(cost, ret);
}
}
- return (cpt == 1);
+ if (cost == Integer.MAX_VALUE) {
+ return -1; // no solution found
+ }
+
+ return cost;
}
+
}
diff --git a/src/main/java/ui/atd/ATDAttack.java b/src/main/java/ui/atd/ATDAttack.java
index 91b3c646342eb7ab9deb52dfc1ecb4a45bad64fb..cddcd0069b6d0f924120f19f88285eedb2f457d5 100644
--- a/src/main/java/ui/atd/ATDAttack.java
+++ b/src/main/java/ui/atd/ATDAttack.java
@@ -467,7 +467,9 @@ public class ATDAttack extends TGCScalableWithInternalComponent implements Swall
public String getAttributes() {
String s = "Description = " + description + "\n";
- s += "Id=" + getId();
+ s += "Id=" + getId() + "\n";
+ s += "Cost=" + getAttackCost() + "\n";
+ s += "Expertise=" + getAttackExperience();
return s;
}
diff --git a/ttool/src/test/java/ui/atd/AttackTreeAnalysisTest.java b/ttool/src/test/java/ui/atd/AttackTreeAnalysisTest.java
index f7a76e8279e89bf29a7564733aa7c6634fd107e5..90d8f3ff8af78281b176f5cabd0fe23ce84f58b8 100644
--- a/ttool/src/test/java/ui/atd/AttackTreeAnalysisTest.java
+++ b/ttool/src/test/java/ui/atd/AttackTreeAnalysisTest.java
@@ -64,7 +64,7 @@ public class AttackTreeAnalysisTest extends AbstractUITest {
private static final String PATH_TO_SOURCE_MODEL = "/ui/atd/input/testAttackTreeAnalysis.xml";
- private static final double RESULTS[] = {0.8, 0.6, 0.8};
+ private static final double RESULTS[] = {0.8, 0.6, 0.8, 0.2};
public AttackTreeAnalysisTest() {
diff --git a/ttool/src/test/resources/ui/atd/input/testAttackTreeAnalysis.xml b/ttool/src/test/resources/ui/atd/input/testAttackTreeAnalysis.xml
index d96ea36deb596a62d5855c68c92310ebfd6df888..d15ae0093733a3e18c103eb81926837831344d24 100644
--- a/ttool/src/test/resources/ui/atd/input/testAttackTreeAnalysis.xml
+++ b/ttool/src/test/resources/ui/atd/input/testAttackTreeAnalysis.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="true" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="0" LAST_SELECTED_SUB_TAB="0">
+<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="true" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="1" LAST_SELECTED_SUB_TAB="1">
<Modeling type="AttackTree" nameTab="AttackTrees_BasicExamples" >
<AttackTreeDiagramPanel name="AttackTreeOR" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
@@ -9,8 +9,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="1" />
-<P1 x="603" y="302" id="29" />
-<P2 x="471" y="252" id="27" />
+<P1 x="603" y="302" id="20" />
+<P2 x="471" y="252" id="18" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="4" >
@@ -18,8 +18,8 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="3" />
-<P1 x="434" y="202" id="16" />
-<P2 x="434" y="137" id="82" />
+<P1 x="434" y="202" id="7" />
+<P2 x="434" y="137" id="73" />
<AutomaticDrawing data="true" />
</CONNECTOR>
<CONNECTOR type="133" id="6" >
@@ -27,156 +27,156 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
<TGConnectingPoint num="0" id="5" />
-<P1 x="310" y="293" id="59" />
-<P2 x="396" y="252" id="26" />
+<P1 x="310" y="293" id="50" />
+<P2 x="396" y="252" id="17" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="1402" id="28" >
+<COMPONENT type="1402" id="19" >
<cdparam x="359" y="202" />
<sizeparam width="150" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="<<OR>>" />
-<TGConnectingPoint num="0" id="16" />
-<TGConnectingPoint num="1" id="17" />
-<TGConnectingPoint num="2" id="18" />
-<TGConnectingPoint num="3" id="19" />
-<TGConnectingPoint num="4" id="20" />
-<TGConnectingPoint num="5" id="21" />
-<TGConnectingPoint num="6" id="22" />
-<TGConnectingPoint num="7" id="23" />
-<TGConnectingPoint num="8" id="24" />
-<TGConnectingPoint num="9" id="25" />
-<TGConnectingPoint num="10" id="26" />
-<TGConnectingPoint num="11" id="27" />
+<TGConnectingPoint num="0" id="7" />
+<TGConnectingPoint num="1" id="8" />
+<TGConnectingPoint num="2" id="9" />
+<TGConnectingPoint num="3" id="10" />
+<TGConnectingPoint num="4" id="11" />
+<TGConnectingPoint num="5" id="12" />
+<TGConnectingPoint num="6" id="13" />
+<TGConnectingPoint num="7" id="14" />
+<TGConnectingPoint num="8" id="15" />
+<TGConnectingPoint num="9" id="16" />
+<TGConnectingPoint num="10" id="17" />
+<TGConnectingPoint num="11" id="18" />
<extraparam>
<info equation="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1401" id="53" >
+<COMPONENT type="1401" id="44" >
<cdparam x="553" y="302" />
<sizeparam width="100" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="attack1" />
-<TGConnectingPoint num="0" id="29" />
-<TGConnectingPoint num="1" id="30" />
-<TGConnectingPoint num="2" id="31" />
-<TGConnectingPoint num="3" id="32" />
-<TGConnectingPoint num="4" id="33" />
-<TGConnectingPoint num="5" id="34" />
-<TGConnectingPoint num="6" id="35" />
-<TGConnectingPoint num="7" id="36" />
-<TGConnectingPoint num="8" id="37" />
-<TGConnectingPoint num="9" id="38" />
-<TGConnectingPoint num="10" id="39" />
-<TGConnectingPoint num="11" id="40" />
-<TGConnectingPoint num="12" id="41" />
-<TGConnectingPoint num="13" id="42" />
-<TGConnectingPoint num="14" id="43" />
-<TGConnectingPoint num="15" id="44" />
-<TGConnectingPoint num="16" id="45" />
-<TGConnectingPoint num="17" id="46" />
-<TGConnectingPoint num="18" id="47" />
-<TGConnectingPoint num="19" id="48" />
-<TGConnectingPoint num="20" id="49" />
-<TGConnectingPoint num="21" id="50" />
-<TGConnectingPoint num="22" id="51" />
-<TGConnectingPoint num="23" id="52" />
+<TGConnectingPoint num="0" id="20" />
+<TGConnectingPoint num="1" id="21" />
+<TGConnectingPoint num="2" id="22" />
+<TGConnectingPoint num="3" id="23" />
+<TGConnectingPoint num="4" id="24" />
+<TGConnectingPoint num="5" id="25" />
+<TGConnectingPoint num="6" id="26" />
+<TGConnectingPoint num="7" id="27" />
+<TGConnectingPoint num="8" id="28" />
+<TGConnectingPoint num="9" id="29" />
+<TGConnectingPoint num="10" id="30" />
+<TGConnectingPoint num="11" id="31" />
+<TGConnectingPoint num="12" id="32" />
+<TGConnectingPoint num="13" id="33" />
+<TGConnectingPoint num="14" id="34" />
+<TGConnectingPoint num="15" id="35" />
+<TGConnectingPoint num="16" id="36" />
+<TGConnectingPoint num="17" id="37" />
+<TGConnectingPoint num="18" id="38" />
+<TGConnectingPoint num="19" id="39" />
+<TGConnectingPoint num="20" id="40" />
+<TGConnectingPoint num="21" id="41" />
+<TGConnectingPoint num="22" id="42" />
+<TGConnectingPoint num="23" id="43" />
<extraparam>
<info description="blah blah blah" root="false" cost="10" experience="2" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1401" id="78" >
+<COMPONENT type="1401" id="69" >
<cdparam x="235" y="293" />
<sizeparam width="100" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="attack0" />
-<TGConnectingPoint num="0" id="54" />
-<TGConnectingPoint num="1" id="55" />
-<TGConnectingPoint num="2" id="56" />
-<TGConnectingPoint num="3" id="57" />
-<TGConnectingPoint num="4" id="58" />
-<TGConnectingPoint num="5" id="59" />
-<TGConnectingPoint num="6" id="60" />
-<TGConnectingPoint num="7" id="61" />
-<TGConnectingPoint num="8" id="62" />
-<TGConnectingPoint num="9" id="63" />
-<TGConnectingPoint num="10" id="64" />
-<TGConnectingPoint num="11" id="65" />
-<TGConnectingPoint num="12" id="66" />
-<TGConnectingPoint num="13" id="67" />
-<TGConnectingPoint num="14" id="68" />
-<TGConnectingPoint num="15" id="69" />
-<TGConnectingPoint num="16" id="70" />
-<TGConnectingPoint num="17" id="71" />
-<TGConnectingPoint num="18" id="72" />
-<TGConnectingPoint num="19" id="73" />
-<TGConnectingPoint num="20" id="74" />
-<TGConnectingPoint num="21" id="75" />
-<TGConnectingPoint num="22" id="76" />
-<TGConnectingPoint num="23" id="77" />
+<TGConnectingPoint num="0" id="45" />
+<TGConnectingPoint num="1" id="46" />
+<TGConnectingPoint num="2" id="47" />
+<TGConnectingPoint num="3" id="48" />
+<TGConnectingPoint num="4" id="49" />
+<TGConnectingPoint num="5" id="50" />
+<TGConnectingPoint num="6" id="51" />
+<TGConnectingPoint num="7" id="52" />
+<TGConnectingPoint num="8" id="53" />
+<TGConnectingPoint num="9" id="54" />
+<TGConnectingPoint num="10" id="55" />
+<TGConnectingPoint num="11" id="56" />
+<TGConnectingPoint num="12" id="57" />
+<TGConnectingPoint num="13" id="58" />
+<TGConnectingPoint num="14" id="59" />
+<TGConnectingPoint num="15" id="60" />
+<TGConnectingPoint num="16" id="61" />
+<TGConnectingPoint num="17" id="62" />
+<TGConnectingPoint num="18" id="63" />
+<TGConnectingPoint num="19" id="64" />
+<TGConnectingPoint num="20" id="65" />
+<TGConnectingPoint num="21" id="66" />
+<TGConnectingPoint num="22" id="67" />
+<TGConnectingPoint num="23" id="68" />
<extraparam>
<info description="blah blah blah" root="false" cost="30" experience="1" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1401" id="103" >
+<COMPONENT type="1401" id="94" >
<cdparam x="373" y="97" />
<sizeparam width="122" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="myRootAttackOR" />
-<TGConnectingPoint num="0" id="79" />
-<TGConnectingPoint num="1" id="80" />
-<TGConnectingPoint num="2" id="81" />
-<TGConnectingPoint num="3" id="82" />
-<TGConnectingPoint num="4" id="83" />
-<TGConnectingPoint num="5" id="84" />
-<TGConnectingPoint num="6" id="85" />
-<TGConnectingPoint num="7" id="86" />
-<TGConnectingPoint num="8" id="87" />
-<TGConnectingPoint num="9" id="88" />
-<TGConnectingPoint num="10" id="89" />
-<TGConnectingPoint num="11" id="90" />
-<TGConnectingPoint num="12" id="91" />
-<TGConnectingPoint num="13" id="92" />
-<TGConnectingPoint num="14" id="93" />
-<TGConnectingPoint num="15" id="94" />
-<TGConnectingPoint num="16" id="95" />
-<TGConnectingPoint num="17" id="96" />
-<TGConnectingPoint num="18" id="97" />
-<TGConnectingPoint num="19" id="98" />
-<TGConnectingPoint num="20" id="99" />
-<TGConnectingPoint num="21" id="100" />
-<TGConnectingPoint num="22" id="101" />
-<TGConnectingPoint num="23" id="102" />
+<TGConnectingPoint num="0" id="70" />
+<TGConnectingPoint num="1" id="71" />
+<TGConnectingPoint num="2" id="72" />
+<TGConnectingPoint num="3" id="73" />
+<TGConnectingPoint num="4" id="74" />
+<TGConnectingPoint num="5" id="75" />
+<TGConnectingPoint num="6" id="76" />
+<TGConnectingPoint num="7" id="77" />
+<TGConnectingPoint num="8" id="78" />
+<TGConnectingPoint num="9" id="79" />
+<TGConnectingPoint num="10" id="80" />
+<TGConnectingPoint num="11" id="81" />
+<TGConnectingPoint num="12" id="82" />
+<TGConnectingPoint num="13" id="83" />
+<TGConnectingPoint num="14" id="84" />
+<TGConnectingPoint num="15" id="85" />
+<TGConnectingPoint num="16" id="86" />
+<TGConnectingPoint num="17" id="87" />
+<TGConnectingPoint num="18" id="88" />
+<TGConnectingPoint num="19" id="89" />
+<TGConnectingPoint num="20" id="90" />
+<TGConnectingPoint num="21" id="91" />
+<TGConnectingPoint num="22" id="92" />
+<TGConnectingPoint num="23" id="93" />
<extraparam>
<info description="blah blah blah" root="true" cost="0" experience="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1404" id="112" >
+<COMPONENT type="1404" id="103" >
<cdparam x="280" y="427" />
<sizeparam width="365" height="142" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="104" />
-<TGConnectingPoint num="1" id="105" />
-<TGConnectingPoint num="2" id="106" />
-<TGConnectingPoint num="3" id="107" />
-<TGConnectingPoint num="4" id="108" />
-<TGConnectingPoint num="5" id="109" />
-<TGConnectingPoint num="6" id="110" />
-<TGConnectingPoint num="7" id="111" />
+<TGConnectingPoint num="0" id="95" />
+<TGConnectingPoint num="1" id="96" />
+<TGConnectingPoint num="2" id="97" />
+<TGConnectingPoint num="3" id="98" />
+<TGConnectingPoint num="4" id="99" />
+<TGConnectingPoint num="5" id="100" />
+<TGConnectingPoint num="6" id="101" />
+<TGConnectingPoint num="7" id="102" />
<extraparam>
<attackergroup name="M1" money="130" expertise="2" occurrence="1" />
<attackergroup name="M2" money="180" expertise="1" occurrence="1" />
@@ -190,179 +190,179 @@
</AttackTreeDiagramPanel>
<AttackTreeDiagramPanel name="AttackTreeAND" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<CONNECTOR type="133" id="114" >
+<CONNECTOR type="133" id="105" >
<cdparam x="711" y="303" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="113" />
-<P1 x="713" y="316" id="132" />
-<P2 x="564" y="262" id="130" />
+<TGConnectingPoint num="0" id="104" />
+<P1 x="713" y="316" id="123" />
+<P2 x="564" y="262" id="121" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="133" id="116" >
+<CONNECTOR type="133" id="107" >
<cdparam x="533" y="201" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="115" />
-<P1 x="527" y="212" id="119" />
-<P2 x="527" y="155" id="185" />
+<TGConnectingPoint num="0" id="106" />
+<P1 x="527" y="212" id="110" />
+<P2 x="527" y="155" id="176" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="133" id="118" >
+<CONNECTOR type="133" id="109" >
<cdparam x="401" y="303" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="117" />
-<P1 x="403" y="303" id="162" />
-<P2 x="489" y="262" id="129" />
+<TGConnectingPoint num="0" id="108" />
+<P1 x="403" y="303" id="153" />
+<P2 x="489" y="262" id="120" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="1402" id="131" >
+<COMPONENT type="1402" id="122" >
<cdparam x="452" y="212" />
<sizeparam width="150" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="<<AND>>" />
-<TGConnectingPoint num="0" id="119" />
-<TGConnectingPoint num="1" id="120" />
-<TGConnectingPoint num="2" id="121" />
-<TGConnectingPoint num="3" id="122" />
-<TGConnectingPoint num="4" id="123" />
-<TGConnectingPoint num="5" id="124" />
-<TGConnectingPoint num="6" id="125" />
-<TGConnectingPoint num="7" id="126" />
-<TGConnectingPoint num="8" id="127" />
-<TGConnectingPoint num="9" id="128" />
-<TGConnectingPoint num="10" id="129" />
-<TGConnectingPoint num="11" id="130" />
+<TGConnectingPoint num="0" id="110" />
+<TGConnectingPoint num="1" id="111" />
+<TGConnectingPoint num="2" id="112" />
+<TGConnectingPoint num="3" id="113" />
+<TGConnectingPoint num="4" id="114" />
+<TGConnectingPoint num="5" id="115" />
+<TGConnectingPoint num="6" id="116" />
+<TGConnectingPoint num="7" id="117" />
+<TGConnectingPoint num="8" id="118" />
+<TGConnectingPoint num="9" id="119" />
+<TGConnectingPoint num="10" id="120" />
+<TGConnectingPoint num="11" id="121" />
<extraparam>
<info equation="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1401" id="156" >
+<COMPONENT type="1401" id="147" >
<cdparam x="663" y="316" />
<sizeparam width="100" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="attack1" />
-<TGConnectingPoint num="0" id="132" />
-<TGConnectingPoint num="1" id="133" />
-<TGConnectingPoint num="2" id="134" />
-<TGConnectingPoint num="3" id="135" />
-<TGConnectingPoint num="4" id="136" />
-<TGConnectingPoint num="5" id="137" />
-<TGConnectingPoint num="6" id="138" />
-<TGConnectingPoint num="7" id="139" />
-<TGConnectingPoint num="8" id="140" />
-<TGConnectingPoint num="9" id="141" />
-<TGConnectingPoint num="10" id="142" />
-<TGConnectingPoint num="11" id="143" />
-<TGConnectingPoint num="12" id="144" />
-<TGConnectingPoint num="13" id="145" />
-<TGConnectingPoint num="14" id="146" />
-<TGConnectingPoint num="15" id="147" />
-<TGConnectingPoint num="16" id="148" />
-<TGConnectingPoint num="17" id="149" />
-<TGConnectingPoint num="18" id="150" />
-<TGConnectingPoint num="19" id="151" />
-<TGConnectingPoint num="20" id="152" />
-<TGConnectingPoint num="21" id="153" />
-<TGConnectingPoint num="22" id="154" />
-<TGConnectingPoint num="23" id="155" />
+<TGConnectingPoint num="0" id="123" />
+<TGConnectingPoint num="1" id="124" />
+<TGConnectingPoint num="2" id="125" />
+<TGConnectingPoint num="3" id="126" />
+<TGConnectingPoint num="4" id="127" />
+<TGConnectingPoint num="5" id="128" />
+<TGConnectingPoint num="6" id="129" />
+<TGConnectingPoint num="7" id="130" />
+<TGConnectingPoint num="8" id="131" />
+<TGConnectingPoint num="9" id="132" />
+<TGConnectingPoint num="10" id="133" />
+<TGConnectingPoint num="11" id="134" />
+<TGConnectingPoint num="12" id="135" />
+<TGConnectingPoint num="13" id="136" />
+<TGConnectingPoint num="14" id="137" />
+<TGConnectingPoint num="15" id="138" />
+<TGConnectingPoint num="16" id="139" />
+<TGConnectingPoint num="17" id="140" />
+<TGConnectingPoint num="18" id="141" />
+<TGConnectingPoint num="19" id="142" />
+<TGConnectingPoint num="20" id="143" />
+<TGConnectingPoint num="21" id="144" />
+<TGConnectingPoint num="22" id="145" />
+<TGConnectingPoint num="23" id="146" />
<extraparam>
<info description="blah blah blah" root="false" cost="10" experience="2" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1401" id="181" >
+<COMPONENT type="1401" id="172" >
<cdparam x="328" y="303" />
<sizeparam width="100" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="attack0" />
-<TGConnectingPoint num="0" id="157" />
-<TGConnectingPoint num="1" id="158" />
-<TGConnectingPoint num="2" id="159" />
-<TGConnectingPoint num="3" id="160" />
-<TGConnectingPoint num="4" id="161" />
-<TGConnectingPoint num="5" id="162" />
-<TGConnectingPoint num="6" id="163" />
-<TGConnectingPoint num="7" id="164" />
-<TGConnectingPoint num="8" id="165" />
-<TGConnectingPoint num="9" id="166" />
-<TGConnectingPoint num="10" id="167" />
-<TGConnectingPoint num="11" id="168" />
-<TGConnectingPoint num="12" id="169" />
-<TGConnectingPoint num="13" id="170" />
-<TGConnectingPoint num="14" id="171" />
-<TGConnectingPoint num="15" id="172" />
-<TGConnectingPoint num="16" id="173" />
-<TGConnectingPoint num="17" id="174" />
-<TGConnectingPoint num="18" id="175" />
-<TGConnectingPoint num="19" id="176" />
-<TGConnectingPoint num="20" id="177" />
-<TGConnectingPoint num="21" id="178" />
-<TGConnectingPoint num="22" id="179" />
-<TGConnectingPoint num="23" id="180" />
+<TGConnectingPoint num="0" id="148" />
+<TGConnectingPoint num="1" id="149" />
+<TGConnectingPoint num="2" id="150" />
+<TGConnectingPoint num="3" id="151" />
+<TGConnectingPoint num="4" id="152" />
+<TGConnectingPoint num="5" id="153" />
+<TGConnectingPoint num="6" id="154" />
+<TGConnectingPoint num="7" id="155" />
+<TGConnectingPoint num="8" id="156" />
+<TGConnectingPoint num="9" id="157" />
+<TGConnectingPoint num="10" id="158" />
+<TGConnectingPoint num="11" id="159" />
+<TGConnectingPoint num="12" id="160" />
+<TGConnectingPoint num="13" id="161" />
+<TGConnectingPoint num="14" id="162" />
+<TGConnectingPoint num="15" id="163" />
+<TGConnectingPoint num="16" id="164" />
+<TGConnectingPoint num="17" id="165" />
+<TGConnectingPoint num="18" id="166" />
+<TGConnectingPoint num="19" id="167" />
+<TGConnectingPoint num="20" id="168" />
+<TGConnectingPoint num="21" id="169" />
+<TGConnectingPoint num="22" id="170" />
+<TGConnectingPoint num="23" id="171" />
<extraparam>
<info description="blah blah blah" root="false" cost="30" experience="1" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1401" id="206" >
+<COMPONENT type="1401" id="197" >
<cdparam x="465" y="115" />
<sizeparam width="125" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="myRootAttackAND" />
-<TGConnectingPoint num="0" id="182" />
-<TGConnectingPoint num="1" id="183" />
-<TGConnectingPoint num="2" id="184" />
-<TGConnectingPoint num="3" id="185" />
-<TGConnectingPoint num="4" id="186" />
-<TGConnectingPoint num="5" id="187" />
-<TGConnectingPoint num="6" id="188" />
-<TGConnectingPoint num="7" id="189" />
-<TGConnectingPoint num="8" id="190" />
-<TGConnectingPoint num="9" id="191" />
-<TGConnectingPoint num="10" id="192" />
-<TGConnectingPoint num="11" id="193" />
-<TGConnectingPoint num="12" id="194" />
-<TGConnectingPoint num="13" id="195" />
-<TGConnectingPoint num="14" id="196" />
-<TGConnectingPoint num="15" id="197" />
-<TGConnectingPoint num="16" id="198" />
-<TGConnectingPoint num="17" id="199" />
-<TGConnectingPoint num="18" id="200" />
-<TGConnectingPoint num="19" id="201" />
-<TGConnectingPoint num="20" id="202" />
-<TGConnectingPoint num="21" id="203" />
-<TGConnectingPoint num="22" id="204" />
-<TGConnectingPoint num="23" id="205" />
+<TGConnectingPoint num="0" id="173" />
+<TGConnectingPoint num="1" id="174" />
+<TGConnectingPoint num="2" id="175" />
+<TGConnectingPoint num="3" id="176" />
+<TGConnectingPoint num="4" id="177" />
+<TGConnectingPoint num="5" id="178" />
+<TGConnectingPoint num="6" id="179" />
+<TGConnectingPoint num="7" id="180" />
+<TGConnectingPoint num="8" id="181" />
+<TGConnectingPoint num="9" id="182" />
+<TGConnectingPoint num="10" id="183" />
+<TGConnectingPoint num="11" id="184" />
+<TGConnectingPoint num="12" id="185" />
+<TGConnectingPoint num="13" id="186" />
+<TGConnectingPoint num="14" id="187" />
+<TGConnectingPoint num="15" id="188" />
+<TGConnectingPoint num="16" id="189" />
+<TGConnectingPoint num="17" id="190" />
+<TGConnectingPoint num="18" id="191" />
+<TGConnectingPoint num="19" id="192" />
+<TGConnectingPoint num="20" id="193" />
+<TGConnectingPoint num="21" id="194" />
+<TGConnectingPoint num="22" id="195" />
+<TGConnectingPoint num="23" id="196" />
<extraparam>
<info description="blah blah blah" root="true" cost="0" experience="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1404" id="215" >
+<COMPONENT type="1404" id="206" >
<cdparam x="112" y="408" />
<sizeparam width="365" height="142" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="207" />
-<TGConnectingPoint num="1" id="208" />
-<TGConnectingPoint num="2" id="209" />
-<TGConnectingPoint num="3" id="210" />
-<TGConnectingPoint num="4" id="211" />
-<TGConnectingPoint num="5" id="212" />
-<TGConnectingPoint num="6" id="213" />
-<TGConnectingPoint num="7" id="214" />
+<TGConnectingPoint num="0" id="198" />
+<TGConnectingPoint num="1" id="199" />
+<TGConnectingPoint num="2" id="200" />
+<TGConnectingPoint num="3" id="201" />
+<TGConnectingPoint num="4" id="202" />
+<TGConnectingPoint num="5" id="203" />
+<TGConnectingPoint num="6" id="204" />
+<TGConnectingPoint num="7" id="205" />
<extraparam>
<attackergroup name="M1" money="130" expertise="2" occurrence="1" />
<attackergroup name="M2" money="180" expertise="1" occurrence="1" />
@@ -381,254 +381,310 @@
<Modeling type="AttackTree" nameTab="AttackTree_GetConfidentialData" >
-<AttackTreeDiagramPanel name="AttackTreeAND" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<CONNECTOR type="133" id="217" >
+<AttackTreeDiagramPanel name="AttackTreeANDOR" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
+<CONNECTOR type="133" id="208" >
<cdparam x="557" y="169" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="216" />
-<P1 x="557" y="169" id="326" />
-<P2 x="557" y="99" id="342" />
+<TGConnectingPoint num="0" id="207" />
+<P1 x="557" y="169" id="317" />
+<P2 x="557" y="99" id="333" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="133" id="219" >
+<CONNECTOR type="133" id="210" >
<cdparam x="708" y="502" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="218" />
-<P1 x="708" y="502" id="373" />
-<P2 x="594" y="219" id="337" />
+<TGConnectingPoint num="0" id="209" />
+<P1 x="708" y="502" id="364" />
+<P2 x="594" y="219" id="328" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="133" id="221" >
+<CONNECTOR type="133" id="212" >
<cdparam x="487" y="302" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="220" />
-<P1 x="451" y="300" id="423" />
-<P2 x="519" y="219" id="336" />
+<TGConnectingPoint num="0" id="211" />
+<P1 x="451" y="300" id="414" />
+<P2 x="519" y="219" id="327" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="133" id="223" >
+<CONNECTOR type="133" id="214" >
<cdparam x="313" y="457" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="222" />
-<P1 x="307" y="448" id="226" />
-<P2 x="413" y="350" id="433" />
+<TGConnectingPoint num="0" id="213" />
+<P1 x="306" y="448" id="217" />
+<P2 x="413" y="350" id="424" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<CONNECTOR type="133" id="225" >
+<CONNECTOR type="133" id="216" >
<cdparam x="749" y="257" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="224" />
-<P1 x="822" y="291" id="280" />
-<P2 x="632" y="194" id="328" />
+<TGConnectingPoint num="0" id="215" />
+<P1 x="822" y="291" id="271" />
+<P2 x="632" y="194" id="319" />
<AutomaticDrawing data="true" />
</CONNECTOR>
-<COMPONENT type="1400" id="275" >
+<COMPONENT type="1400" id="266" >
<cdparam x="192" y="386" />
<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Block2" value="Bus" />
-<TGConnectingPoint num="0" id="251" />
-<TGConnectingPoint num="1" id="252" />
-<TGConnectingPoint num="2" id="253" />
-<TGConnectingPoint num="3" id="254" />
-<TGConnectingPoint num="4" id="255" />
-<TGConnectingPoint num="5" id="256" />
-<TGConnectingPoint num="6" id="257" />
-<TGConnectingPoint num="7" id="258" />
-<TGConnectingPoint num="8" id="259" />
-<TGConnectingPoint num="9" id="260" />
-<TGConnectingPoint num="10" id="261" />
-<TGConnectingPoint num="11" id="262" />
-<TGConnectingPoint num="12" id="263" />
-<TGConnectingPoint num="13" id="264" />
-<TGConnectingPoint num="14" id="265" />
-<TGConnectingPoint num="15" id="266" />
-<TGConnectingPoint num="16" id="267" />
-<TGConnectingPoint num="17" id="268" />
-<TGConnectingPoint num="18" id="269" />
-<TGConnectingPoint num="19" id="270" />
-<TGConnectingPoint num="20" id="271" />
-<TGConnectingPoint num="21" id="272" />
-<TGConnectingPoint num="22" id="273" />
-<TGConnectingPoint num="23" id="274" />
+<TGConnectingPoint num="0" id="242" />
+<TGConnectingPoint num="1" id="243" />
+<TGConnectingPoint num="2" id="244" />
+<TGConnectingPoint num="3" id="245" />
+<TGConnectingPoint num="4" id="246" />
+<TGConnectingPoint num="5" id="247" />
+<TGConnectingPoint num="6" id="248" />
+<TGConnectingPoint num="7" id="249" />
+<TGConnectingPoint num="8" id="250" />
+<TGConnectingPoint num="9" id="251" />
+<TGConnectingPoint num="10" id="252" />
+<TGConnectingPoint num="11" id="253" />
+<TGConnectingPoint num="12" id="254" />
+<TGConnectingPoint num="13" id="255" />
+<TGConnectingPoint num="14" id="256" />
+<TGConnectingPoint num="15" id="257" />
+<TGConnectingPoint num="16" id="258" />
+<TGConnectingPoint num="17" id="259" />
+<TGConnectingPoint num="18" id="260" />
+<TGConnectingPoint num="19" id="261" />
+<TGConnectingPoint num="20" id="262" />
+<TGConnectingPoint num="21" id="263" />
+<TGConnectingPoint num="22" id="264" />
+<TGConnectingPoint num="23" id="265" />
</COMPONENT>
-<SUBCOMPONENT type="1401" id="250" >
-<father id="275" num="0" />
-<cdparam x="257" y="448" />
+<SUBCOMPONENT type="1401" id="241" >
+<father id="266" num="0" />
+<cdparam x="256" y="448" />
<sizeparam width="100" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="150" minY="0" maxY="160" />
<infoparam name="TGComponent" value="BusProbing" />
-<TGConnectingPoint num="0" id="226" />
-<TGConnectingPoint num="1" id="227" />
-<TGConnectingPoint num="2" id="228" />
-<TGConnectingPoint num="3" id="229" />
-<TGConnectingPoint num="4" id="230" />
-<TGConnectingPoint num="5" id="231" />
-<TGConnectingPoint num="6" id="232" />
-<TGConnectingPoint num="7" id="233" />
-<TGConnectingPoint num="8" id="234" />
-<TGConnectingPoint num="9" id="235" />
-<TGConnectingPoint num="10" id="236" />
-<TGConnectingPoint num="11" id="237" />
-<TGConnectingPoint num="12" id="238" />
-<TGConnectingPoint num="13" id="239" />
-<TGConnectingPoint num="14" id="240" />
-<TGConnectingPoint num="15" id="241" />
-<TGConnectingPoint num="16" id="242" />
-<TGConnectingPoint num="17" id="243" />
-<TGConnectingPoint num="18" id="244" />
-<TGConnectingPoint num="19" id="245" />
-<TGConnectingPoint num="20" id="246" />
-<TGConnectingPoint num="21" id="247" />
-<TGConnectingPoint num="22" id="248" />
-<TGConnectingPoint num="23" id="249" />
+<TGConnectingPoint num="0" id="217" />
+<TGConnectingPoint num="1" id="218" />
+<TGConnectingPoint num="2" id="219" />
+<TGConnectingPoint num="3" id="220" />
+<TGConnectingPoint num="4" id="221" />
+<TGConnectingPoint num="5" id="222" />
+<TGConnectingPoint num="6" id="223" />
+<TGConnectingPoint num="7" id="224" />
+<TGConnectingPoint num="8" id="225" />
+<TGConnectingPoint num="9" id="226" />
+<TGConnectingPoint num="10" id="227" />
+<TGConnectingPoint num="11" id="228" />
+<TGConnectingPoint num="12" id="229" />
+<TGConnectingPoint num="13" id="230" />
+<TGConnectingPoint num="14" id="231" />
+<TGConnectingPoint num="15" id="232" />
+<TGConnectingPoint num="16" id="233" />
+<TGConnectingPoint num="17" id="234" />
+<TGConnectingPoint num="18" id="235" />
+<TGConnectingPoint num="19" id="236" />
+<TGConnectingPoint num="20" id="237" />
+<TGConnectingPoint num="21" id="238" />
+<TGConnectingPoint num="22" id="239" />
+<TGConnectingPoint num="23" id="240" />
<extraparam>
<info description="blah blah blah" root="false" cost="40" experience="1" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1400" id="325" >
+<COMPONENT type="1400" id="316" >
<cdparam x="723" y="210" />
<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Block0" value="OS" />
-<TGConnectingPoint num="0" id="301" />
-<TGConnectingPoint num="1" id="302" />
-<TGConnectingPoint num="2" id="303" />
-<TGConnectingPoint num="3" id="304" />
-<TGConnectingPoint num="4" id="305" />
-<TGConnectingPoint num="5" id="306" />
-<TGConnectingPoint num="6" id="307" />
-<TGConnectingPoint num="7" id="308" />
-<TGConnectingPoint num="8" id="309" />
-<TGConnectingPoint num="9" id="310" />
-<TGConnectingPoint num="10" id="311" />
-<TGConnectingPoint num="11" id="312" />
-<TGConnectingPoint num="12" id="313" />
-<TGConnectingPoint num="13" id="314" />
-<TGConnectingPoint num="14" id="315" />
-<TGConnectingPoint num="15" id="316" />
-<TGConnectingPoint num="16" id="317" />
-<TGConnectingPoint num="17" id="318" />
-<TGConnectingPoint num="18" id="319" />
-<TGConnectingPoint num="19" id="320" />
-<TGConnectingPoint num="20" id="321" />
-<TGConnectingPoint num="21" id="322" />
-<TGConnectingPoint num="22" id="323" />
-<TGConnectingPoint num="23" id="324" />
+<TGConnectingPoint num="0" id="292" />
+<TGConnectingPoint num="1" id="293" />
+<TGConnectingPoint num="2" id="294" />
+<TGConnectingPoint num="3" id="295" />
+<TGConnectingPoint num="4" id="296" />
+<TGConnectingPoint num="5" id="297" />
+<TGConnectingPoint num="6" id="298" />
+<TGConnectingPoint num="7" id="299" />
+<TGConnectingPoint num="8" id="300" />
+<TGConnectingPoint num="9" id="301" />
+<TGConnectingPoint num="10" id="302" />
+<TGConnectingPoint num="11" id="303" />
+<TGConnectingPoint num="12" id="304" />
+<TGConnectingPoint num="13" id="305" />
+<TGConnectingPoint num="14" id="306" />
+<TGConnectingPoint num="15" id="307" />
+<TGConnectingPoint num="16" id="308" />
+<TGConnectingPoint num="17" id="309" />
+<TGConnectingPoint num="18" id="310" />
+<TGConnectingPoint num="19" id="311" />
+<TGConnectingPoint num="20" id="312" />
+<TGConnectingPoint num="21" id="313" />
+<TGConnectingPoint num="22" id="314" />
+<TGConnectingPoint num="23" id="315" />
</COMPONENT>
-<SUBCOMPONENT type="1401" id="300" >
-<father id="325" num="0" />
+<SUBCOMPONENT type="1401" id="291" >
+<father id="316" num="0" />
<cdparam x="796" y="291" />
<sizeparam width="104" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="146" minY="0" maxY="160" />
<infoparam name="TGComponent" value="BufferOverflow" />
-<TGConnectingPoint num="0" id="276" />
-<TGConnectingPoint num="1" id="277" />
-<TGConnectingPoint num="2" id="278" />
-<TGConnectingPoint num="3" id="279" />
-<TGConnectingPoint num="4" id="280" />
-<TGConnectingPoint num="5" id="281" />
-<TGConnectingPoint num="6" id="282" />
-<TGConnectingPoint num="7" id="283" />
-<TGConnectingPoint num="8" id="284" />
-<TGConnectingPoint num="9" id="285" />
-<TGConnectingPoint num="10" id="286" />
-<TGConnectingPoint num="11" id="287" />
-<TGConnectingPoint num="12" id="288" />
-<TGConnectingPoint num="13" id="289" />
-<TGConnectingPoint num="14" id="290" />
-<TGConnectingPoint num="15" id="291" />
-<TGConnectingPoint num="16" id="292" />
-<TGConnectingPoint num="17" id="293" />
-<TGConnectingPoint num="18" id="294" />
-<TGConnectingPoint num="19" id="295" />
-<TGConnectingPoint num="20" id="296" />
-<TGConnectingPoint num="21" id="297" />
-<TGConnectingPoint num="22" id="298" />
-<TGConnectingPoint num="23" id="299" />
+<TGConnectingPoint num="0" id="267" />
+<TGConnectingPoint num="1" id="268" />
+<TGConnectingPoint num="2" id="269" />
+<TGConnectingPoint num="3" id="270" />
+<TGConnectingPoint num="4" id="271" />
+<TGConnectingPoint num="5" id="272" />
+<TGConnectingPoint num="6" id="273" />
+<TGConnectingPoint num="7" id="274" />
+<TGConnectingPoint num="8" id="275" />
+<TGConnectingPoint num="9" id="276" />
+<TGConnectingPoint num="10" id="277" />
+<TGConnectingPoint num="11" id="278" />
+<TGConnectingPoint num="12" id="279" />
+<TGConnectingPoint num="13" id="280" />
+<TGConnectingPoint num="14" id="281" />
+<TGConnectingPoint num="15" id="282" />
+<TGConnectingPoint num="16" id="283" />
+<TGConnectingPoint num="17" id="284" />
+<TGConnectingPoint num="18" id="285" />
+<TGConnectingPoint num="19" id="286" />
+<TGConnectingPoint num="20" id="287" />
+<TGConnectingPoint num="21" id="288" />
+<TGConnectingPoint num="22" id="289" />
+<TGConnectingPoint num="23" id="290" />
<extraparam>
<info description="blah blah blah" root="false" cost="90" experience="0" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1402" id="338" >
+<COMPONENT type="1402" id="329" >
<cdparam x="482" y="169" />
<sizeparam width="150" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="<<OR>>" />
-<TGConnectingPoint num="0" id="326" />
-<TGConnectingPoint num="1" id="327" />
-<TGConnectingPoint num="2" id="328" />
-<TGConnectingPoint num="3" id="329" />
-<TGConnectingPoint num="4" id="330" />
-<TGConnectingPoint num="5" id="331" />
-<TGConnectingPoint num="6" id="332" />
-<TGConnectingPoint num="7" id="333" />
-<TGConnectingPoint num="8" id="334" />
-<TGConnectingPoint num="9" id="335" />
-<TGConnectingPoint num="10" id="336" />
-<TGConnectingPoint num="11" id="337" />
+<TGConnectingPoint num="0" id="317" />
+<TGConnectingPoint num="1" id="318" />
+<TGConnectingPoint num="2" id="319" />
+<TGConnectingPoint num="3" id="320" />
+<TGConnectingPoint num="4" id="321" />
+<TGConnectingPoint num="5" id="322" />
+<TGConnectingPoint num="6" id="323" />
+<TGConnectingPoint num="7" id="324" />
+<TGConnectingPoint num="8" id="325" />
+<TGConnectingPoint num="9" id="326" />
+<TGConnectingPoint num="10" id="327" />
+<TGConnectingPoint num="11" id="328" />
<extraparam>
<info equation="" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1401" id="363" >
+<COMPONENT type="1401" id="354" >
<cdparam x="490" y="59" />
<sizeparam width="135" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="GetConfidentialData" />
-<TGConnectingPoint num="0" id="339" />
-<TGConnectingPoint num="1" id="340" />
-<TGConnectingPoint num="2" id="341" />
-<TGConnectingPoint num="3" id="342" />
-<TGConnectingPoint num="4" id="343" />
-<TGConnectingPoint num="5" id="344" />
-<TGConnectingPoint num="6" id="345" />
-<TGConnectingPoint num="7" id="346" />
-<TGConnectingPoint num="8" id="347" />
-<TGConnectingPoint num="9" id="348" />
-<TGConnectingPoint num="10" id="349" />
-<TGConnectingPoint num="11" id="350" />
-<TGConnectingPoint num="12" id="351" />
-<TGConnectingPoint num="13" id="352" />
-<TGConnectingPoint num="14" id="353" />
-<TGConnectingPoint num="15" id="354" />
-<TGConnectingPoint num="16" id="355" />
-<TGConnectingPoint num="17" id="356" />
-<TGConnectingPoint num="18" id="357" />
-<TGConnectingPoint num="19" id="358" />
-<TGConnectingPoint num="20" id="359" />
-<TGConnectingPoint num="21" id="360" />
-<TGConnectingPoint num="22" id="361" />
-<TGConnectingPoint num="23" id="362" />
+<TGConnectingPoint num="0" id="330" />
+<TGConnectingPoint num="1" id="331" />
+<TGConnectingPoint num="2" id="332" />
+<TGConnectingPoint num="3" id="333" />
+<TGConnectingPoint num="4" id="334" />
+<TGConnectingPoint num="5" id="335" />
+<TGConnectingPoint num="6" id="336" />
+<TGConnectingPoint num="7" id="337" />
+<TGConnectingPoint num="8" id="338" />
+<TGConnectingPoint num="9" id="339" />
+<TGConnectingPoint num="10" id="340" />
+<TGConnectingPoint num="11" id="341" />
+<TGConnectingPoint num="12" id="342" />
+<TGConnectingPoint num="13" id="343" />
+<TGConnectingPoint num="14" id="344" />
+<TGConnectingPoint num="15" id="345" />
+<TGConnectingPoint num="16" id="346" />
+<TGConnectingPoint num="17" id="347" />
+<TGConnectingPoint num="18" id="348" />
+<TGConnectingPoint num="19" id="349" />
+<TGConnectingPoint num="20" id="350" />
+<TGConnectingPoint num="21" id="351" />
+<TGConnectingPoint num="22" id="352" />
+<TGConnectingPoint num="23" id="353" />
<extraparam>
<info description="blah blah blah" root="true" cost="0" experience="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="1404" id="372" >
+<COMPONENT type="1404" id="363" >
<cdparam x="10" y="51" />
<sizeparam width="365" height="142" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TGComponent" value="null" />
+<TGConnectingPoint num="0" id="355" />
+<TGConnectingPoint num="1" id="356" />
+<TGConnectingPoint num="2" id="357" />
+<TGConnectingPoint num="3" id="358" />
+<TGConnectingPoint num="4" id="359" />
+<TGConnectingPoint num="5" id="360" />
+<TGConnectingPoint num="6" id="361" />
+<TGConnectingPoint num="7" id="362" />
+<extraparam>
+<attackergroup name="M1" money="130" expertise="2" occurrence="1" />
+<attackergroup name="M2" money="180" expertise="1" occurrence="1" />
+<attackergroup name="M3" money="60" expertise="2" occurrence="1" />
+<attackergroup name="M4" money="40" expertise="2" occurrence="1" />
+<attackergroup name="M5" money="70" expertise="0" occurrence="1" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1400" id="413" >
+<cdparam x="483" y="446" />
+<sizeparam width="412" height="144" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Block3" value="Processor" />
+<TGConnectingPoint num="0" id="389" />
+<TGConnectingPoint num="1" id="390" />
+<TGConnectingPoint num="2" id="391" />
+<TGConnectingPoint num="3" id="392" />
+<TGConnectingPoint num="4" id="393" />
+<TGConnectingPoint num="5" id="394" />
+<TGConnectingPoint num="6" id="395" />
+<TGConnectingPoint num="7" id="396" />
+<TGConnectingPoint num="8" id="397" />
+<TGConnectingPoint num="9" id="398" />
+<TGConnectingPoint num="10" id="399" />
+<TGConnectingPoint num="11" id="400" />
+<TGConnectingPoint num="12" id="401" />
+<TGConnectingPoint num="13" id="402" />
+<TGConnectingPoint num="14" id="403" />
+<TGConnectingPoint num="15" id="404" />
+<TGConnectingPoint num="16" id="405" />
+<TGConnectingPoint num="17" id="406" />
+<TGConnectingPoint num="18" id="407" />
+<TGConnectingPoint num="19" id="408" />
+<TGConnectingPoint num="20" id="409" />
+<TGConnectingPoint num="21" id="410" />
+<TGConnectingPoint num="22" id="411" />
+<TGConnectingPoint num="23" id="412" />
+</COMPONENT>
+<SUBCOMPONENT type="1401" id="388" >
+<father id="413" num="0" />
+<cdparam x="658" y="502" />
+<sizeparam width="100" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="312" minY="0" maxY="104" />
+<infoparam name="TGComponent" value="SCA" />
<TGConnectingPoint num="0" id="364" />
<TGConnectingPoint num="1" id="365" />
<TGConnectingPoint num="2" id="366" />
@@ -637,6 +693,341 @@
<TGConnectingPoint num="5" id="369" />
<TGConnectingPoint num="6" id="370" />
<TGConnectingPoint num="7" id="371" />
+<TGConnectingPoint num="8" id="372" />
+<TGConnectingPoint num="9" id="373" />
+<TGConnectingPoint num="10" id="374" />
+<TGConnectingPoint num="11" id="375" />
+<TGConnectingPoint num="12" id="376" />
+<TGConnectingPoint num="13" id="377" />
+<TGConnectingPoint num="14" id="378" />
+<TGConnectingPoint num="15" id="379" />
+<TGConnectingPoint num="16" id="380" />
+<TGConnectingPoint num="17" id="381" />
+<TGConnectingPoint num="18" id="382" />
+<TGConnectingPoint num="19" id="383" />
+<TGConnectingPoint num="20" id="384" />
+<TGConnectingPoint num="21" id="385" />
+<TGConnectingPoint num="22" id="386" />
+<TGConnectingPoint num="23" id="387" />
+<extraparam>
+<info description="" root="false" cost="50" experience="1" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="1400" id="451" >
+<cdparam x="109" y="10" />
+<sizeparam width="884" height="641" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Block1" value="System" />
+<TGConnectingPoint num="0" id="427" />
+<TGConnectingPoint num="1" id="428" />
+<TGConnectingPoint num="2" id="429" />
+<TGConnectingPoint num="3" id="430" />
+<TGConnectingPoint num="4" id="431" />
+<TGConnectingPoint num="5" id="432" />
+<TGConnectingPoint num="6" id="433" />
+<TGConnectingPoint num="7" id="434" />
+<TGConnectingPoint num="8" id="435" />
+<TGConnectingPoint num="9" id="436" />
+<TGConnectingPoint num="10" id="437" />
+<TGConnectingPoint num="11" id="438" />
+<TGConnectingPoint num="12" id="439" />
+<TGConnectingPoint num="13" id="440" />
+<TGConnectingPoint num="14" id="441" />
+<TGConnectingPoint num="15" id="442" />
+<TGConnectingPoint num="16" id="443" />
+<TGConnectingPoint num="17" id="444" />
+<TGConnectingPoint num="18" id="445" />
+<TGConnectingPoint num="19" id="446" />
+<TGConnectingPoint num="20" id="447" />
+<TGConnectingPoint num="21" id="448" />
+<TGConnectingPoint num="22" id="449" />
+<TGConnectingPoint num="23" id="450" />
+</COMPONENT>
+<SUBCOMPONENT type="1402" id="426" >
+<father id="451" num="0" />
+<cdparam x="376" y="300" />
+<sizeparam width="150" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="747" minY="0" maxY="732" />
+<infoparam name="TGComponent" value="<<AND>>" />
+<TGConnectingPoint num="0" id="414" />
+<TGConnectingPoint num="1" id="415" />
+<TGConnectingPoint num="2" id="416" />
+<TGConnectingPoint num="3" id="417" />
+<TGConnectingPoint num="4" id="418" />
+<TGConnectingPoint num="5" id="419" />
+<TGConnectingPoint num="6" id="420" />
+<TGConnectingPoint num="7" id="421" />
+<TGConnectingPoint num="8" id="422" />
+<TGConnectingPoint num="9" id="423" />
+<TGConnectingPoint num="10" id="424" />
+<TGConnectingPoint num="11" id="425" />
+<extraparam>
+<info equation="" />
+</extraparam>
+</SUBCOMPONENT>
+
+
+</AttackTreeDiagramPanel>
+
+<AttackTreeDiagramPanel name="AttackTreeANDAND" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
+<CONNECTOR type="133" id="453" >
+<cdparam x="587" y="188" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="" />
+<TGConnectingPoint num="0" id="452" />
+<P1 x="587" y="188" id="562" />
+<P2 x="587" y="118" id="578" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="133" id="455" >
+<cdparam x="738" y="521" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="" />
+<TGConnectingPoint num="0" id="454" />
+<P1 x="738" y="521" id="609" />
+<P2 x="624" y="238" id="573" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="133" id="457" >
+<cdparam x="517" y="321" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="" />
+<TGConnectingPoint num="0" id="456" />
+<P1 x="481" y="319" id="659" />
+<P2 x="549" y="238" id="572" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="133" id="459" >
+<cdparam x="343" y="476" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="" />
+<TGConnectingPoint num="0" id="458" />
+<P1 x="336" y="467" id="462" />
+<P2 x="443" y="369" id="669" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<CONNECTOR type="133" id="461" >
+<cdparam x="779" y="276" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="" />
+<TGConnectingPoint num="0" id="460" />
+<P1 x="852" y="310" id="516" />
+<P2 x="662" y="213" id="564" />
+<AutomaticDrawing data="true" />
+</CONNECTOR>
+<COMPONENT type="1400" id="511" >
+<cdparam x="222" y="405" />
+<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Block2" value="Bus" />
+<TGConnectingPoint num="0" id="487" />
+<TGConnectingPoint num="1" id="488" />
+<TGConnectingPoint num="2" id="489" />
+<TGConnectingPoint num="3" id="490" />
+<TGConnectingPoint num="4" id="491" />
+<TGConnectingPoint num="5" id="492" />
+<TGConnectingPoint num="6" id="493" />
+<TGConnectingPoint num="7" id="494" />
+<TGConnectingPoint num="8" id="495" />
+<TGConnectingPoint num="9" id="496" />
+<TGConnectingPoint num="10" id="497" />
+<TGConnectingPoint num="11" id="498" />
+<TGConnectingPoint num="12" id="499" />
+<TGConnectingPoint num="13" id="500" />
+<TGConnectingPoint num="14" id="501" />
+<TGConnectingPoint num="15" id="502" />
+<TGConnectingPoint num="16" id="503" />
+<TGConnectingPoint num="17" id="504" />
+<TGConnectingPoint num="18" id="505" />
+<TGConnectingPoint num="19" id="506" />
+<TGConnectingPoint num="20" id="507" />
+<TGConnectingPoint num="21" id="508" />
+<TGConnectingPoint num="22" id="509" />
+<TGConnectingPoint num="23" id="510" />
+</COMPONENT>
+<SUBCOMPONENT type="1401" id="486" >
+<father id="511" num="0" />
+<cdparam x="286" y="467" />
+<sizeparam width="100" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="150" minY="0" maxY="160" />
+<infoparam name="TGComponent" value="BusProbing" />
+<TGConnectingPoint num="0" id="462" />
+<TGConnectingPoint num="1" id="463" />
+<TGConnectingPoint num="2" id="464" />
+<TGConnectingPoint num="3" id="465" />
+<TGConnectingPoint num="4" id="466" />
+<TGConnectingPoint num="5" id="467" />
+<TGConnectingPoint num="6" id="468" />
+<TGConnectingPoint num="7" id="469" />
+<TGConnectingPoint num="8" id="470" />
+<TGConnectingPoint num="9" id="471" />
+<TGConnectingPoint num="10" id="472" />
+<TGConnectingPoint num="11" id="473" />
+<TGConnectingPoint num="12" id="474" />
+<TGConnectingPoint num="13" id="475" />
+<TGConnectingPoint num="14" id="476" />
+<TGConnectingPoint num="15" id="477" />
+<TGConnectingPoint num="16" id="478" />
+<TGConnectingPoint num="17" id="479" />
+<TGConnectingPoint num="18" id="480" />
+<TGConnectingPoint num="19" id="481" />
+<TGConnectingPoint num="20" id="482" />
+<TGConnectingPoint num="21" id="483" />
+<TGConnectingPoint num="22" id="484" />
+<TGConnectingPoint num="23" id="485" />
+<extraparam>
+<info description="blah blah blah" root="false" cost="40" experience="1" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="1400" id="561" >
+<cdparam x="753" y="229" />
+<sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Block0" value="OS" />
+<TGConnectingPoint num="0" id="537" />
+<TGConnectingPoint num="1" id="538" />
+<TGConnectingPoint num="2" id="539" />
+<TGConnectingPoint num="3" id="540" />
+<TGConnectingPoint num="4" id="541" />
+<TGConnectingPoint num="5" id="542" />
+<TGConnectingPoint num="6" id="543" />
+<TGConnectingPoint num="7" id="544" />
+<TGConnectingPoint num="8" id="545" />
+<TGConnectingPoint num="9" id="546" />
+<TGConnectingPoint num="10" id="547" />
+<TGConnectingPoint num="11" id="548" />
+<TGConnectingPoint num="12" id="549" />
+<TGConnectingPoint num="13" id="550" />
+<TGConnectingPoint num="14" id="551" />
+<TGConnectingPoint num="15" id="552" />
+<TGConnectingPoint num="16" id="553" />
+<TGConnectingPoint num="17" id="554" />
+<TGConnectingPoint num="18" id="555" />
+<TGConnectingPoint num="19" id="556" />
+<TGConnectingPoint num="20" id="557" />
+<TGConnectingPoint num="21" id="558" />
+<TGConnectingPoint num="22" id="559" />
+<TGConnectingPoint num="23" id="560" />
+</COMPONENT>
+<SUBCOMPONENT type="1401" id="536" >
+<father id="561" num="0" />
+<cdparam x="826" y="310" />
+<sizeparam width="104" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="146" minY="0" maxY="160" />
+<infoparam name="TGComponent" value="BufferOverflow" />
+<TGConnectingPoint num="0" id="512" />
+<TGConnectingPoint num="1" id="513" />
+<TGConnectingPoint num="2" id="514" />
+<TGConnectingPoint num="3" id="515" />
+<TGConnectingPoint num="4" id="516" />
+<TGConnectingPoint num="5" id="517" />
+<TGConnectingPoint num="6" id="518" />
+<TGConnectingPoint num="7" id="519" />
+<TGConnectingPoint num="8" id="520" />
+<TGConnectingPoint num="9" id="521" />
+<TGConnectingPoint num="10" id="522" />
+<TGConnectingPoint num="11" id="523" />
+<TGConnectingPoint num="12" id="524" />
+<TGConnectingPoint num="13" id="525" />
+<TGConnectingPoint num="14" id="526" />
+<TGConnectingPoint num="15" id="527" />
+<TGConnectingPoint num="16" id="528" />
+<TGConnectingPoint num="17" id="529" />
+<TGConnectingPoint num="18" id="530" />
+<TGConnectingPoint num="19" id="531" />
+<TGConnectingPoint num="20" id="532" />
+<TGConnectingPoint num="21" id="533" />
+<TGConnectingPoint num="22" id="534" />
+<TGConnectingPoint num="23" id="535" />
+<extraparam>
+<info description="blah blah blah" root="false" cost="90" experience="0" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="1402" id="574" >
+<cdparam x="512" y="188" />
+<sizeparam width="150" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="TGComponent" value="<<AND>>" />
+<TGConnectingPoint num="0" id="562" />
+<TGConnectingPoint num="1" id="563" />
+<TGConnectingPoint num="2" id="564" />
+<TGConnectingPoint num="3" id="565" />
+<TGConnectingPoint num="4" id="566" />
+<TGConnectingPoint num="5" id="567" />
+<TGConnectingPoint num="6" id="568" />
+<TGConnectingPoint num="7" id="569" />
+<TGConnectingPoint num="8" id="570" />
+<TGConnectingPoint num="9" id="571" />
+<TGConnectingPoint num="10" id="572" />
+<TGConnectingPoint num="11" id="573" />
+<extraparam>
+<info equation="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1401" id="599" >
+<cdparam x="520" y="78" />
+<sizeparam width="135" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="TGComponent" value="GetConfidentialData" />
+<TGConnectingPoint num="0" id="575" />
+<TGConnectingPoint num="1" id="576" />
+<TGConnectingPoint num="2" id="577" />
+<TGConnectingPoint num="3" id="578" />
+<TGConnectingPoint num="4" id="579" />
+<TGConnectingPoint num="5" id="580" />
+<TGConnectingPoint num="6" id="581" />
+<TGConnectingPoint num="7" id="582" />
+<TGConnectingPoint num="8" id="583" />
+<TGConnectingPoint num="9" id="584" />
+<TGConnectingPoint num="10" id="585" />
+<TGConnectingPoint num="11" id="586" />
+<TGConnectingPoint num="12" id="587" />
+<TGConnectingPoint num="13" id="588" />
+<TGConnectingPoint num="14" id="589" />
+<TGConnectingPoint num="15" id="590" />
+<TGConnectingPoint num="16" id="591" />
+<TGConnectingPoint num="17" id="592" />
+<TGConnectingPoint num="18" id="593" />
+<TGConnectingPoint num="19" id="594" />
+<TGConnectingPoint num="20" id="595" />
+<TGConnectingPoint num="21" id="596" />
+<TGConnectingPoint num="22" id="597" />
+<TGConnectingPoint num="23" id="598" />
+<extraparam>
+<info description="blah blah blah" root="true" cost="0" experience="0" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1404" id="608" >
+<cdparam x="40" y="70" />
+<sizeparam width="365" height="142" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="TGComponent" value="null" />
+<TGConnectingPoint num="0" id="600" />
+<TGConnectingPoint num="1" id="601" />
+<TGConnectingPoint num="2" id="602" />
+<TGConnectingPoint num="3" id="603" />
+<TGConnectingPoint num="4" id="604" />
+<TGConnectingPoint num="5" id="605" />
+<TGConnectingPoint num="6" id="606" />
+<TGConnectingPoint num="7" id="607" />
<extraparam>
<attackergroup name="M1" money="130" expertise="2" occurrence="1" />
<attackergroup name="M2" money="180" expertise="1" occurrence="1" />
@@ -646,124 +1037,124 @@
</extraparam>
</COMPONENT>
-<COMPONENT type="1400" id="422" >
-<cdparam x="483" y="446" />
+<COMPONENT type="1400" id="658" >
+<cdparam x="513" y="465" />
<sizeparam width="412" height="144" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Block3" value="Processor" />
-<TGConnectingPoint num="0" id="398" />
-<TGConnectingPoint num="1" id="399" />
-<TGConnectingPoint num="2" id="400" />
-<TGConnectingPoint num="3" id="401" />
-<TGConnectingPoint num="4" id="402" />
-<TGConnectingPoint num="5" id="403" />
-<TGConnectingPoint num="6" id="404" />
-<TGConnectingPoint num="7" id="405" />
-<TGConnectingPoint num="8" id="406" />
-<TGConnectingPoint num="9" id="407" />
-<TGConnectingPoint num="10" id="408" />
-<TGConnectingPoint num="11" id="409" />
-<TGConnectingPoint num="12" id="410" />
-<TGConnectingPoint num="13" id="411" />
-<TGConnectingPoint num="14" id="412" />
-<TGConnectingPoint num="15" id="413" />
-<TGConnectingPoint num="16" id="414" />
-<TGConnectingPoint num="17" id="415" />
-<TGConnectingPoint num="18" id="416" />
-<TGConnectingPoint num="19" id="417" />
-<TGConnectingPoint num="20" id="418" />
-<TGConnectingPoint num="21" id="419" />
-<TGConnectingPoint num="22" id="420" />
-<TGConnectingPoint num="23" id="421" />
+<TGConnectingPoint num="0" id="634" />
+<TGConnectingPoint num="1" id="635" />
+<TGConnectingPoint num="2" id="636" />
+<TGConnectingPoint num="3" id="637" />
+<TGConnectingPoint num="4" id="638" />
+<TGConnectingPoint num="5" id="639" />
+<TGConnectingPoint num="6" id="640" />
+<TGConnectingPoint num="7" id="641" />
+<TGConnectingPoint num="8" id="642" />
+<TGConnectingPoint num="9" id="643" />
+<TGConnectingPoint num="10" id="644" />
+<TGConnectingPoint num="11" id="645" />
+<TGConnectingPoint num="12" id="646" />
+<TGConnectingPoint num="13" id="647" />
+<TGConnectingPoint num="14" id="648" />
+<TGConnectingPoint num="15" id="649" />
+<TGConnectingPoint num="16" id="650" />
+<TGConnectingPoint num="17" id="651" />
+<TGConnectingPoint num="18" id="652" />
+<TGConnectingPoint num="19" id="653" />
+<TGConnectingPoint num="20" id="654" />
+<TGConnectingPoint num="21" id="655" />
+<TGConnectingPoint num="22" id="656" />
+<TGConnectingPoint num="23" id="657" />
</COMPONENT>
-<SUBCOMPONENT type="1401" id="397" >
-<father id="422" num="0" />
-<cdparam x="658" y="502" />
+<SUBCOMPONENT type="1401" id="633" >
+<father id="658" num="0" />
+<cdparam x="688" y="521" />
<sizeparam width="100" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<enabled value="true" />
<cdrectangleparam minX="0" maxX="312" minY="0" maxY="104" />
<infoparam name="TGComponent" value="SCA" />
-<TGConnectingPoint num="0" id="373" />
-<TGConnectingPoint num="1" id="374" />
-<TGConnectingPoint num="2" id="375" />
-<TGConnectingPoint num="3" id="376" />
-<TGConnectingPoint num="4" id="377" />
-<TGConnectingPoint num="5" id="378" />
-<TGConnectingPoint num="6" id="379" />
-<TGConnectingPoint num="7" id="380" />
-<TGConnectingPoint num="8" id="381" />
-<TGConnectingPoint num="9" id="382" />
-<TGConnectingPoint num="10" id="383" />
-<TGConnectingPoint num="11" id="384" />
-<TGConnectingPoint num="12" id="385" />
-<TGConnectingPoint num="13" id="386" />
-<TGConnectingPoint num="14" id="387" />
-<TGConnectingPoint num="15" id="388" />
-<TGConnectingPoint num="16" id="389" />
-<TGConnectingPoint num="17" id="390" />
-<TGConnectingPoint num="18" id="391" />
-<TGConnectingPoint num="19" id="392" />
-<TGConnectingPoint num="20" id="393" />
-<TGConnectingPoint num="21" id="394" />
-<TGConnectingPoint num="22" id="395" />
-<TGConnectingPoint num="23" id="396" />
+<TGConnectingPoint num="0" id="609" />
+<TGConnectingPoint num="1" id="610" />
+<TGConnectingPoint num="2" id="611" />
+<TGConnectingPoint num="3" id="612" />
+<TGConnectingPoint num="4" id="613" />
+<TGConnectingPoint num="5" id="614" />
+<TGConnectingPoint num="6" id="615" />
+<TGConnectingPoint num="7" id="616" />
+<TGConnectingPoint num="8" id="617" />
+<TGConnectingPoint num="9" id="618" />
+<TGConnectingPoint num="10" id="619" />
+<TGConnectingPoint num="11" id="620" />
+<TGConnectingPoint num="12" id="621" />
+<TGConnectingPoint num="13" id="622" />
+<TGConnectingPoint num="14" id="623" />
+<TGConnectingPoint num="15" id="624" />
+<TGConnectingPoint num="16" id="625" />
+<TGConnectingPoint num="17" id="626" />
+<TGConnectingPoint num="18" id="627" />
+<TGConnectingPoint num="19" id="628" />
+<TGConnectingPoint num="20" id="629" />
+<TGConnectingPoint num="21" id="630" />
+<TGConnectingPoint num="22" id="631" />
+<TGConnectingPoint num="23" id="632" />
<extraparam>
<info description="" root="false" cost="50" experience="1" />
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="1400" id="460" >
-<cdparam x="109" y="10" />
+<COMPONENT type="1400" id="696" >
+<cdparam x="139" y="29" />
<sizeparam width="884" height="641" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Block1" value="System" />
-<TGConnectingPoint num="0" id="436" />
-<TGConnectingPoint num="1" id="437" />
-<TGConnectingPoint num="2" id="438" />
-<TGConnectingPoint num="3" id="439" />
-<TGConnectingPoint num="4" id="440" />
-<TGConnectingPoint num="5" id="441" />
-<TGConnectingPoint num="6" id="442" />
-<TGConnectingPoint num="7" id="443" />
-<TGConnectingPoint num="8" id="444" />
-<TGConnectingPoint num="9" id="445" />
-<TGConnectingPoint num="10" id="446" />
-<TGConnectingPoint num="11" id="447" />
-<TGConnectingPoint num="12" id="448" />
-<TGConnectingPoint num="13" id="449" />
-<TGConnectingPoint num="14" id="450" />
-<TGConnectingPoint num="15" id="451" />
-<TGConnectingPoint num="16" id="452" />
-<TGConnectingPoint num="17" id="453" />
-<TGConnectingPoint num="18" id="454" />
-<TGConnectingPoint num="19" id="455" />
-<TGConnectingPoint num="20" id="456" />
-<TGConnectingPoint num="21" id="457" />
-<TGConnectingPoint num="22" id="458" />
-<TGConnectingPoint num="23" id="459" />
+<TGConnectingPoint num="0" id="672" />
+<TGConnectingPoint num="1" id="673" />
+<TGConnectingPoint num="2" id="674" />
+<TGConnectingPoint num="3" id="675" />
+<TGConnectingPoint num="4" id="676" />
+<TGConnectingPoint num="5" id="677" />
+<TGConnectingPoint num="6" id="678" />
+<TGConnectingPoint num="7" id="679" />
+<TGConnectingPoint num="8" id="680" />
+<TGConnectingPoint num="9" id="681" />
+<TGConnectingPoint num="10" id="682" />
+<TGConnectingPoint num="11" id="683" />
+<TGConnectingPoint num="12" id="684" />
+<TGConnectingPoint num="13" id="685" />
+<TGConnectingPoint num="14" id="686" />
+<TGConnectingPoint num="15" id="687" />
+<TGConnectingPoint num="16" id="688" />
+<TGConnectingPoint num="17" id="689" />
+<TGConnectingPoint num="18" id="690" />
+<TGConnectingPoint num="19" id="691" />
+<TGConnectingPoint num="20" id="692" />
+<TGConnectingPoint num="21" id="693" />
+<TGConnectingPoint num="22" id="694" />
+<TGConnectingPoint num="23" id="695" />
</COMPONENT>
-<SUBCOMPONENT type="1402" id="435" >
-<father id="460" num="0" />
-<cdparam x="376" y="300" />
+<SUBCOMPONENT type="1402" id="671" >
+<father id="696" num="0" />
+<cdparam x="406" y="319" />
<sizeparam width="150" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="0" maxX="747" minY="0" maxY="732" />
<infoparam name="TGComponent" value="<<AND>>" />
-<TGConnectingPoint num="0" id="423" />
-<TGConnectingPoint num="1" id="424" />
-<TGConnectingPoint num="2" id="425" />
-<TGConnectingPoint num="3" id="426" />
-<TGConnectingPoint num="4" id="427" />
-<TGConnectingPoint num="5" id="428" />
-<TGConnectingPoint num="6" id="429" />
-<TGConnectingPoint num="7" id="430" />
-<TGConnectingPoint num="8" id="431" />
-<TGConnectingPoint num="9" id="432" />
-<TGConnectingPoint num="10" id="433" />
-<TGConnectingPoint num="11" id="434" />
+<TGConnectingPoint num="0" id="659" />
+<TGConnectingPoint num="1" id="660" />
+<TGConnectingPoint num="2" id="661" />
+<TGConnectingPoint num="3" id="662" />
+<TGConnectingPoint num="4" id="663" />
+<TGConnectingPoint num="5" id="664" />
+<TGConnectingPoint num="6" id="665" />
+<TGConnectingPoint num="7" id="666" />
+<TGConnectingPoint num="8" id="667" />
+<TGConnectingPoint num="9" id="668" />
+<TGConnectingPoint num="10" id="669" />
+<TGConnectingPoint num="11" id="670" />
<extraparam>
<info equation="" />
</extraparam>