update model

acceliance · Sep 13, 2018 · 700544c · 700544c
1 parent dcf92c5
commit 700544c
Show file tree

Hide file tree

Showing 22 changed files with 76 additions and 38 deletions.
diff --git a/IngeniBridge.Sample.MyCompany/.vs/IngeniBridge.Samples.MyCompany/DesignTimeBuild/.dtbcache b/IngeniBridge.Sample.MyCompany/.vs/IngeniBridge.Samples.MyCompany/DesignTimeBuild/.dtbcache
diff --git a/IngeniBridge.Sample.MyCompany/.vs/IngeniBridge.Samples.MyCompany/v15/.suo b/IngeniBridge.Sample.MyCompany/.vs/IngeniBridge.Samples.MyCompany/v15/.suo
diff --git a/...ge.Sample.MyCompany/.vs/IngeniBridge.Samples.MyCompany/v15/Server/sqlite3/storage.ide-shm b/...ge.Sample.MyCompany/.vs/IngeniBridge.Samples.MyCompany/v15/Server/sqlite3/storage.ide-shm
diff --git a/...ge.Sample.MyCompany/.vs/IngeniBridge.Samples.MyCompany/v15/Server/sqlite3/storage.ide-wal b/...ge.Sample.MyCompany/.vs/IngeniBridge.Samples.MyCompany/v15/Server/sqlite3/storage.ide-wal
diff --git a/...idge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/MasterAssetMyCompany_2018_09_13.ibdb b/...idge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/MasterAssetMyCompany_2018_09_13.ibdb
diff --git a/...mpany/IngeniBridge.Samples.MyCompany/bin/Debug/IngeniBridge.Samples.MyCompany.1.0.0.nupkg b/...mpany/IngeniBridge.Samples.MyCompany/bin/Debug/IngeniBridge.Samples.MyCompany.1.0.0.nupkg
diff --git a/...Company/IngeniBridge.Samples.MyCompany/bin/Debug/net45/IngeniBridge.Samples.MyCompany.log b/...Company/IngeniBridge.Samples.MyCompany/bin/Debug/net45/IngeniBridge.Samples.MyCompany.log
@@ -64,3 +64,35 @@
 2018-09-13 11:11:23,609;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;InfluenceZone => 2, nbvars => 0
 2018-09-13 11:11:23,610;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;nb total assets => 12
 2018-09-13 11:11:23,611;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;nb total datas => 11
+2018-09-13 11:25:13,852;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;IngeniBridge.Samples.MyCompany v1.0.0.0 -- Copyright � DEAGITAL 2016
+2018-09-13 11:25:13,870;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;Starting => IngeniBridge.Samples.MyCompany v1.0.0.0
+2018-09-13 11:25:13,871;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;Data Model => MyCompanyDataModel v1.0.0.1
+2018-09-13 11:25:14,810;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;TypeOfMeasure, nbentries => 5
+2018-09-13 11:25:14,810;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;Sector, nbentries => 2
+2018-09-13 11:25:14,810;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;City, nbentries => 2
+2018-09-13 11:25:14,813;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;ProductionSite => 3, nbvars => 1
+2018-09-13 11:25:14,813;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;GroupOfPumps => 1, nbvars => 1
+2018-09-13 11:25:14,814;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;WaterPump => 2, nbvars => 2
+2018-09-13 11:25:14,814;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;PressureSensor => 1, nbvars => 1
+2018-09-13 11:25:14,814;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;ClorineInjector => 1, nbvars => 4
+2018-09-13 11:25:14,814;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;MultiFunctionSensor => 1, nbvars => 1
+2018-09-13 11:25:14,814;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;WaterSwitcher => 1, nbvars => 1
+2018-09-13 11:25:14,814;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;InfluenceZone => 2, nbvars => 0
+2018-09-13 11:25:14,814;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;nb total assets => 12
+2018-09-13 11:25:14,814;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;nb total datas => 11
+2018-09-13 11:39:05,943;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;IngeniBridge.Samples.MyCompany v1.0.0.0 -- Copyright � DEAGITAL 2016
+2018-09-13 11:39:05,967;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;Starting => IngeniBridge.Samples.MyCompany v1.0.0.0
+2018-09-13 11:39:05,967;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;Data Model => MyCompanyDataModel v1.0.0.1
+2018-09-13 11:39:06,900;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;TypeOfMeasure, nbentries => 5
+2018-09-13 11:39:06,900;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;Sector, nbentries => 2
+2018-09-13 11:39:06,900;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;City, nbentries => 2
+2018-09-13 11:39:06,904;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;ProductionSite => 3, nbvars => 1
+2018-09-13 11:39:06,905;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;GroupOfPumps => 1, nbvars => 1
+2018-09-13 11:39:06,905;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;WaterPump => 2, nbvars => 2
+2018-09-13 11:39:06,905;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;PressureSensor => 1, nbvars => 1
+2018-09-13 11:39:06,905;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;ClorineInjector => 1, nbvars => 4
+2018-09-13 11:39:06,905;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;MultiFunctionSensor => 1, nbvars => 1
+2018-09-13 11:39:06,905;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;WaterSwitcher => 1, nbvars => 1
+2018-09-13 11:39:06,905;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;InfluenceZone => 2, nbvars => 0
+2018-09-13 11:39:06,905;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;nb total assets => 12
+2018-09-13 11:39:06,905;[1];INFO ;IngeniBridge.Samples.MyCompany.Program;nb total datas => 11
diff --git a/...ge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/net45/MyCompanyDataModel.dll b/...ge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/net45/MyCompanyDataModel.dll
diff --git a/...ge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/net45/MyCompanyDataModel.pdb b/...ge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/bin/Debug/net45/MyCompanyDataModel.pdb
diff --git a/...es.MyCompany/obj/Debug/net45/IngeniBridge.Samples.MyCompany.csprojAssemblyReference.cache b/...es.MyCompany/obj/Debug/net45/IngeniBridge.Samples.MyCompany.csprojAssemblyReference.cache
diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/Assets.cs b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/Assets.cs
@@ -7,7 +7,7 @@
 
 namespace MyCompanyDataModel
 {
-    public class MyCompanyAsset : Asset
+    public abstract class MyCompanyAsset : Asset
     {
     }
 }
diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/FullDataModel.cd b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/FullDataModel.cd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
   <Class Name="MyCompanyDataModel.MyCompanyRootAsset">
-    <Position X="1" Y="2.75" Width="2" />
+    <Position X="0.5" Y="3.5" Width="2" />
     <AssociationLine Name="ProductionSites" Type="MyCompanyDataModel.ProductionSite">
       <MemberNameLabel ManuallyPlaced="true">
         <Position X="0.006" Y="0.435" />
@@ -16,19 +16,17 @@
     </ShowAsCollectionAssociation>
   </Class>
   <Class Name="MyCompanyDataModel.ProductionSite">
-    <Position X="0.75" Y="5" Width="1.5" />
+    <Position X="0.75" Y="6.75" Width="1.5" />
     <InheritanceLine Type="MyCompanyDataModel.MyCompanyAsset" ManuallyRouted="true" FixedToPoint="true">
       <Path>
-        <Point X="5" Y="3.747" />
-        <Point X="5" Y="4.105" />
-        <Point X="2.052" Y="4.105" Type="JumpStart" />
-        <Point X="1.885" Y="4.105" Type="JumpEnd" />
-        <Point X="1.562" Y="4.105" />
-        <Point X="1.562" Y="5" />
+        <Point X="5" Y="4.497" />
+        <Point X="5" Y="5.673" />
+        <Point X="1.562" Y="5.673" />
+        <Point X="1.562" Y="6.75" />
       </Path>
     </InheritanceLine>
     <TypeIdentifier>
-      <HashCode>AAAAAAAACAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAIgA=</HashCode>
+      <HashCode>AAAAAAAACAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAgA=</HashCode>
       <FileName>Site.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
@@ -39,21 +37,21 @@
     </ShowAsCollectionAssociation>
   </Class>
   <Class Name="MyCompanyDataModel.Equipment">
-    <Position X="4.25" Y="5" Width="1.5" />
+    <Position X="4.25" Y="6.5" Width="1.5" />
     <AssociationLine Name="SubEquipments" Type="MyCompanyDataModel.Equipment" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
       <Path>
-        <Point X="5.5" Y="5" />
-        <Point X="5.5" Y="4.761" />
-        <Point X="6.063" Y="4.761" />
-        <Point X="6.063" Y="5.303" />
-        <Point X="5.75" Y="5.303" />
+        <Point X="5.5" Y="6.5" />
+        <Point X="5.5" Y="6.029" />
+        <Point X="6.063" Y="6.029" />
+        <Point X="6.063" Y="6.803" />
+        <Point X="5.75" Y="6.803" />
       </Path>
       <MemberNameLabel ManuallyPlaced="true">
         <Position X="0.415" Y="0.245" />
       </MemberNameLabel>
     </AssociationLine>
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAiAAAAAAAAAAAAAAAAAIAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAIAAAAA=</HashCode>
       <FileName>Equipment.cs</FileName>
     </TypeIdentifier>
     <ShowAsCollectionAssociation>
@@ -62,101 +60,109 @@
     </ShowAsCollectionAssociation>
   </Class>
   <Class Name="MyCompanyDataModel.MyCompanyAsset">
-    <Position X="4.25" Y="2.75" Width="1.5" />
+    <Position X="4.25" Y="3.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Assets.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="MyCompanyDataModel.MyCompanyData">
-    <Position X="11" Y="3" Width="2" />
+    <Position X="11.5" Y="4.25" Width="1.75" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAQAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Measure.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
-      <Property Name="TypeOfMeasure" />
+      <Property Name="tof" />
     </ShowAsAssociation>
   </Class>
   <Class Name="MyCompanyDataModel.AcquiredMeasure">
-    <Position X="10" Y="5" Width="1.5" />
+    <Position X="10.25" Y="6.25" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Measure.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="MyCompanyDataModel.TypeOfMeasure">
-    <Position X="14.5" Y="3" Width="1.5" />
+    <Position X="15.25" Y="4.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Nomenclatures.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="MyCompanyDataModel.ComputedMeasure">
-    <Position X="12.25" Y="5" Width="1.75" />
+    <Position X="12.5" Y="6.25" Width="1.75" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Measure.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="MyCompanyDataModel.ClorineInjector">
-    <Position X="2.5" Y="6.75" Width="1.5" />
+    <Position X="2.5" Y="8.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Equipment.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="MyCompanyDataModel.IOT">
-    <Position X="8" Y="6.75" Width="1.75" />
+    <Position X="8" Y="8.5" Width="1.75" />
+    <InheritanceLine Type="MyCompanyDataModel.MyCompanyAsset" ManuallyRouted="true">
+      <Path>
+        <Point X="5" Y="4.497" />
+        <Point X="5" Y="5.683" />
+        <Point X="8.875" Y="5.683" />
+        <Point X="8.875" Y="8.5" />
+      </Path>
+    </InheritanceLine>
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Equipment.cs</FileName>
+      <FileName>IOTs.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="MyCompanyDataModel.MultiFunctionSensor" Collapsed="true">
-    <Position X="9" Y="8.5" Width="1.75" />
+    <Position X="9" Y="10.5" Width="1.75" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Equipment.cs</FileName>
+      <FileName>IOTs.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="MyCompanyDataModel.PressureSensor" Collapsed="true">
-    <Position X="7" Y="8.5" Width="1.5" />
+    <Position X="7" Y="10.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Equipment.cs</FileName>
+      <FileName>IOTs.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="MyCompanyDataModel.Sector">
-    <Position X="0.75" Y="6.75" Width="1.5" />
+    <Position X="0.75" Y="9" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Nomenclatures.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="MyCompanyDataModel.WaterPump">
-    <Position X="4.25" Y="6.75" Width="1.5" />
+    <Position X="4.25" Y="8.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Equipment.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="MyCompanyDataModel.GroupOfPumps">
-    <Position X="6" Y="6.75" Width="1.5" />
+    <Position X="6" Y="8.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Equipment.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="IngeniBridge.Core.TimedData">
-    <Position X="11" Y="0.5" Width="2" />
+    <Position X="11.25" Y="0.5" Width="2.25" />
     <Compartments>
       <Compartment Name="Methods" Collapsed="true" />
     </Compartments>
     <TypeIdentifier />
   </Class>
   <Class Name="IngeniBridge.Core.Asset">
-    <Position X="4.25" Y="0.5" Width="1.5" />
+    <Position X="4.25" Y="0.5" Width="1.75" />
     <Compartments>
       <Compartment Name="Methods" Collapsed="true" />
     </Compartments>

diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/FullDataModel.cd.pdf b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/FullDataModel.cd.pdf
diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/IOTs.cs b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/IOTs.cs
@@ -5,7 +5,7 @@
 
 namespace MyCompanyDataModel
 {
-    public class IOT : MyCompanyAsset
+    public abstract class IOT : MyCompanyAsset
     {
         [IndexPropertyOnParents]
         public string TelephoneNumber { get; set; }

diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/net45/MyCompanyDataModel.dll b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/net45/MyCompanyDataModel.dll
diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/net45/MyCompanyDataModel.pdb b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/net45/MyCompanyDataModel.pdb
diff --git a/...ridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/netstandard2.0/MyCompanyDataModel.dll b/...ridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/netstandard2.0/MyCompanyDataModel.dll
diff --git a/...ridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/netstandard2.0/MyCompanyDataModel.pdb b/...ridge.Sample.MyCompany/MyCompanyDataModel/bin/Debug/netstandard2.0/MyCompanyDataModel.pdb
diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/net45/MyCompanyDataModel.dll b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/net45/MyCompanyDataModel.dll
diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/net45/MyCompanyDataModel.pdb b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/net45/MyCompanyDataModel.pdb
diff --git a/...ridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/netstandard2.0/MyCompanyDataModel.dll b/...ridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/netstandard2.0/MyCompanyDataModel.dll
diff --git a/...ridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/netstandard2.0/MyCompanyDataModel.pdb b/...ridge.Sample.MyCompany/MyCompanyDataModel/obj/Debug/netstandard2.0/MyCompanyDataModel.pdb