No commit message

hauerCodes · Dec 15, 2014 · 06e388d · 06e388d
1 parent 31a34f4
commit 06e388d
Show file tree

Hide file tree

Showing 19 changed files with 256 additions and 88 deletions.
diff --git a/NumberRecognizer/NumberRecognizer.App/NumberRecognizer.App.csproj b/NumberRecognizer/NumberRecognizer.App/NumberRecognizer.App.csproj
@@ -168,18 +168,18 @@
     <Content Include="Assets\MediumGray.png" />
     <Content Include="Assets\DarkGray.png" />
     <Content Include="Lib\De.TorstenMandelkow.MetroChart.dll" />
-    <None Include="Service References\NumberRecognizerService\NumberRecognizerService.disco" />
-    <None Include="Service References\NumberRecognizerService\NumberRecognizerService.wsdl" />
-    <None Include="Service References\NumberRecognizerService\NumberRecognizerService.xsd">
+    <None Include="Service References\NumberRecognizerService\NumberRecognizerService1.disco" />
+    <None Include="Service References\NumberRecognizerService\NumberRecognizerService1.wsdl" />
+    <None Include="Service References\NumberRecognizerService\NumberRecognizerService4.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Service References\NumberRecognizerService\NumberRecognizerService1.xsd">
+    <None Include="Service References\NumberRecognizerService\NumberRecognizerService41.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Service References\NumberRecognizerService\NumberRecognizerService2.xsd">
+    <None Include="Service References\NumberRecognizerService\NumberRecognizerService42.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Service References\NumberRecognizerService\NumberRecognizerService3.xsd">
+    <None Include="Service References\NumberRecognizerService\NumberRecognizerService43.xsd">
       <SubType>Designer</SubType>
     </None>
     <None Include="Service References\NumberRecognizerService\Reference.svcmap">

diff --git a/...izerService/NumberRecognizerService.disco → ...zerService/NumberRecognizerService1.disco b/...izerService/NumberRecognizerService.disco → ...zerService/NumberRecognizerService1.disco
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
-  <contractRef ref="http://4574b9813eec49b598955c6a87e643e2.cloudapp.net/NumberRecognizerService.svc?wsdl" docRef="http://4574b9813eec49b598955c6a87e643e2.cloudapp.net/NumberRecognizerService.svc" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
+  <contractRef ref="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc?wsdl" docRef="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
 </discovery>
diff --git a/...nizerService/NumberRecognizerService.wsdl → ...izerService/NumberRecognizerService1.wsdl b/...nizerService/NumberRecognizerService.wsdl → ...izerService/NumberRecognizerService1.wsdl
@@ -2,10 +2,10 @@
 <wsdl:definitions xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:tns="http://tempuri.org/" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="NumberRecognizerService" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <wsdl:types>
     <xsd:schema targetNamespace="http://tempuri.org/Imports">
-      <xsd:import schemaLocation="http://4574b9813eec49b598955c6a87e643e2.cloudapp.net/NumberRecognizerService.svc?xsd=xsd0" namespace="http://tempuri.org/" />
-      <xsd:import schemaLocation="http://4574b9813eec49b598955c6a87e643e2.cloudapp.net/NumberRecognizerService.svc?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
-      <xsd:import schemaLocation="http://4574b9813eec49b598955c6a87e643e2.cloudapp.net/NumberRecognizerService.svc?xsd=xsd2" namespace="http://schemas.datacontract.org/2004/07/NumberRecognizer.Cloud.Contract.Data" />
-      <xsd:import schemaLocation="http://4574b9813eec49b598955c6a87e643e2.cloudapp.net/NumberRecognizerService.svc?xsd=xsd3" namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
+      <xsd:import schemaLocation="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc?xsd=xsd0" namespace="http://tempuri.org/" />
+      <xsd:import schemaLocation="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
+      <xsd:import schemaLocation="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc?xsd=xsd2" namespace="http://schemas.datacontract.org/2004/07/NumberRecognizer.Cloud.Contract.Data" />
+      <xsd:import schemaLocation="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc?xsd=xsd3" namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
     </xsd:schema>
   </wsdl:types>
   <wsdl:message name="INumberRecognizerService_GetNetworks_InputMessage">
@@ -26,6 +26,12 @@
   <wsdl:message name="INumberRecognizerService_CreateNetworkWithTrainingDataCopy_OutputMessage">
     <wsdl:part name="parameters" element="tns:CreateNetworkWithTrainingDataCopyResponse" />
   </wsdl:message>
+  <wsdl:message name="INumberRecognizerService_DeleteNetwork_InputMessage">
+    <wsdl:part name="parameters" element="tns:DeleteNetwork" />
+  </wsdl:message>
+  <wsdl:message name="INumberRecognizerService_DeleteNetwork_OutputMessage">
+    <wsdl:part name="parameters" element="tns:DeleteNetworkResponse" />
+  </wsdl:message>
   <wsdl:message name="INumberRecognizerService_RecognizePhoneNumber_InputMessage">
     <wsdl:part name="parameters" element="tns:RecognizePhoneNumber" />
   </wsdl:message>
@@ -45,6 +51,10 @@
       <wsdl:input wsaw:Action="http://tempuri.org/INumberRecognizerService/CreateNetworkWithTrainingDataCopy" message="tns:INumberRecognizerService_CreateNetworkWithTrainingDataCopy_InputMessage" />
       <wsdl:output wsaw:Action="http://tempuri.org/INumberRecognizerService/CreateNetworkWithTrainingDataCopyResponse" message="tns:INumberRecognizerService_CreateNetworkWithTrainingDataCopy_OutputMessage" />
     </wsdl:operation>
+    <wsdl:operation name="DeleteNetwork">
+      <wsdl:input wsaw:Action="http://tempuri.org/INumberRecognizerService/DeleteNetwork" message="tns:INumberRecognizerService_DeleteNetwork_InputMessage" />
+      <wsdl:output wsaw:Action="http://tempuri.org/INumberRecognizerService/DeleteNetworkResponse" message="tns:INumberRecognizerService_DeleteNetwork_OutputMessage" />
+    </wsdl:operation>
     <wsdl:operation name="RecognizePhoneNumber">
       <wsdl:input wsaw:Action="http://tempuri.org/INumberRecognizerService/RecognizePhoneNumber" message="tns:INumberRecognizerService_RecognizePhoneNumber_InputMessage" />
       <wsdl:output wsaw:Action="http://tempuri.org/INumberRecognizerService/RecognizePhoneNumberResponse" message="tns:INumberRecognizerService_RecognizePhoneNumber_OutputMessage" />
@@ -79,6 +89,15 @@
         <soap:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
+    <wsdl:operation name="DeleteNetwork">
+      <soap:operation soapAction="http://tempuri.org/INumberRecognizerService/DeleteNetwork" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
     <wsdl:operation name="RecognizePhoneNumber">
       <soap:operation soapAction="http://tempuri.org/INumberRecognizerService/RecognizePhoneNumber" style="document" />
       <wsdl:input>
@@ -91,7 +110,7 @@
   </wsdl:binding>
   <wsdl:service name="NumberRecognizerService">
     <wsdl:port name="BasicHttpBinding_INumberRecognizerService" binding="tns:BasicHttpBinding_INumberRecognizerService">
-      <soap:address location="http://4574b9813eec49b598955c6a87e643e2.cloudapp.net/NumberRecognizerService.svc" />
+      <soap:address location="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc" />
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>
diff --git a/...nizerService/NumberRecognizerService1.xsd → ...nizerService/NumberRecognizerService4.xsd b/...nizerService/NumberRecognizerService1.xsd → ...nizerService/NumberRecognizerService4.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/NumberRecognizer.Cloud.Contract.Data" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/NumberRecognizer.Cloud.Contract.Data" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:import schemaLocation="http://4574b9813eec49b598955c6a87e643e2.cloudapp.net/NumberRecognizerService.svc?xsd=xsd3" namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
+  <xs:import schemaLocation="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc?xsd=xsd3" namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
   <xs:complexType name="ArrayOfNetworkInfo">
     <xs:sequence>
       <xs:element minOccurs="0" maxOccurs="unbounded" name="NetworkInfo" nillable="true" type="tns:NetworkInfo" />
@@ -18,7 +18,6 @@
       <xs:element minOccurs="0" name="NetworkFitness" type="xs:double" />
       <xs:element minOccurs="0" name="NetworkId" type="xs:int" />
       <xs:element minOccurs="0" name="NetworkName" nillable="true" type="xs:string" />
-      <xs:element minOccurs="0" name="Username" nillable="true" type="xs:string" />
     </xs:sequence>
   </xs:complexType>
   <xs:element name="NetworkInfo" nillable="true" type="tns:NetworkInfo" />

diff --git a/...gnizerService/NumberRecognizerService.xsd → ...izerService/NumberRecognizerService41.xsd b/...gnizerService/NumberRecognizerService.xsd → ...izerService/NumberRecognizerService41.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:ser="http://schemas.microsoft.com/2003/10/Serialization/" xmlns:tns="http://schemas.microsoft.com/2003/10/Serialization/Arrays" elementFormDefault="qualified" targetNamespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:import schemaLocation="http://4574b9813eec49b598955c6a87e643e2.cloudapp.net/NumberRecognizerService.svc?xsd=xsd2" namespace="http://schemas.datacontract.org/2004/07/NumberRecognizer.Cloud.Contract.Data" />
-  <xs:import schemaLocation="http://4574b9813eec49b598955c6a87e643e2.cloudapp.net/NumberRecognizerService.svc?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
+  <xs:import schemaLocation="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc?xsd=xsd2" namespace="http://schemas.datacontract.org/2004/07/NumberRecognizer.Cloud.Contract.Data" />
+  <xs:import schemaLocation="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
   <xs:complexType name="ArrayOfKeyValueOfstringdouble">
     <xs:annotation>
       <xs:appinfo>

diff --git a/...nizerService/NumberRecognizerService2.xsd → ...izerService/NumberRecognizerService42.xsd b/...nizerService/NumberRecognizerService2.xsd → ...izerService/NumberRecognizerService42.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:tns="http://tempuri.org/" elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:import schemaLocation="http://4574b9813eec49b598955c6a87e643e2.cloudapp.net/NumberRecognizerService.svc?xsd=xsd2" namespace="http://schemas.datacontract.org/2004/07/NumberRecognizer.Cloud.Contract.Data" />
+  <xs:import schemaLocation="http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc?xsd=xsd2" namespace="http://schemas.datacontract.org/2004/07/NumberRecognizer.Cloud.Contract.Data" />
   <xs:element name="GetNetworks">
     <xs:complexType>
       <xs:sequence />
@@ -17,7 +17,6 @@
     <xs:complexType>
       <xs:sequence>
         <xs:element minOccurs="0" name="networkName" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="username" nillable="true" type="xs:string" />
         <xs:element xmlns:q2="http://schemas.datacontract.org/2004/07/NumberRecognizer.Cloud.Contract.Data" minOccurs="0" name="individualTrainingsData" nillable="true" type="q2:ArrayOfTrainingImage" />
       </xs:sequence>
     </xs:complexType>
@@ -33,7 +32,6 @@
     <xs:complexType>
       <xs:sequence>
         <xs:element minOccurs="0" name="networkName" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="username" nillable="true" type="xs:string" />
         <xs:element xmlns:q3="http://schemas.datacontract.org/2004/07/NumberRecognizer.Cloud.Contract.Data" minOccurs="0" name="individualTrainingsData" nillable="true" type="q3:ArrayOfTrainingImage" />
         <xs:element minOccurs="0" name="copyTraindataFromNetworkId" type="xs:int" />
       </xs:sequence>
@@ -46,6 +44,20 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+  <xs:element name="DeleteNetwork">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" name="networkId" type="xs:int" />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="DeleteNetworkResponse">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" name="DeleteNetworkResult" type="xs:boolean" />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="RecognizePhoneNumber">
     <xs:complexType>
       <xs:sequence>

diff --git a/...nizerService/NumberRecognizerService3.xsd → ...izerService/NumberRecognizerService43.xsd b/...nizerService/NumberRecognizerService3.xsd → ...izerService/NumberRecognizerService43.xsd
diff --git a/...erRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/Reference.cs b/...erRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/Reference.cs
@@ -22,11 +22,14 @@ public interface INumberRecognizerService {
         System.Threading.Tasks.Task<System.Collections.ObjectModel.ObservableCollection<NumberRecognizer.Cloud.Contract.Data.NetworkInfo>> GetNetworksAsync();
 
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/INumberRecognizerService/CreateNetwork", ReplyAction="http://tempuri.org/INumberRecognizerService/CreateNetworkResponse")]
-        System.Threading.Tasks.Task<bool> CreateNetworkAsync(string networkName, string username, System.Collections.ObjectModel.ObservableCollection<NumberRecognizer.Cloud.Contract.Data.TrainingImage> individualTrainingsData);
+        System.Threading.Tasks.Task<bool> CreateNetworkAsync(string networkName, System.Collections.ObjectModel.ObservableCollection<NumberRecognizer.Cloud.Contract.Data.TrainingImage> individualTrainingsData);
 
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/INumberRecognizerService/CreateNetworkWithTrainingDataCopy", ReplyAction="http://tempuri.org/INumberRecognizerService/CreateNetworkWithTrainingDataCopyResp" +
             "onse")]
-        System.Threading.Tasks.Task<bool> CreateNetworkWithTrainingDataCopyAsync(string networkName, string username, System.Collections.ObjectModel.ObservableCollection<NumberRecognizer.Cloud.Contract.Data.TrainingImage> individualTrainingsData, int copyTraindataFromNetworkId);
+        System.Threading.Tasks.Task<bool> CreateNetworkWithTrainingDataCopyAsync(string networkName, System.Collections.ObjectModel.ObservableCollection<NumberRecognizer.Cloud.Contract.Data.TrainingImage> individualTrainingsData, int copyTraindataFromNetworkId);
+
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/INumberRecognizerService/DeleteNetwork", ReplyAction="http://tempuri.org/INumberRecognizerService/DeleteNetworkResponse")]
+        System.Threading.Tasks.Task<bool> DeleteNetworkAsync(int networkId);
 
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/INumberRecognizerService/RecognizePhoneNumber", ReplyAction="http://tempuri.org/INumberRecognizerService/RecognizePhoneNumberResponse")]
         System.Threading.Tasks.Task<NumberRecognizer.Cloud.Contract.Data.NumberRecognitionResult> RecognizePhoneNumberAsync(int networkId, System.Collections.ObjectModel.ObservableCollection<NumberRecognizer.Cloud.Contract.Data.RecognitionImage> imageData);
@@ -79,12 +82,16 @@ public NumberRecognizerServiceClient(System.ServiceModel.Channels.Binding bindin
             return base.Channel.GetNetworksAsync();
         }
 
-        public System.Threading.Tasks.Task<bool> CreateNetworkAsync(string networkName, string username, System.Collections.ObjectModel.ObservableCollection<NumberRecognizer.Cloud.Contract.Data.TrainingImage> individualTrainingsData) {
-            return base.Channel.CreateNetworkAsync(networkName, username, individualTrainingsData);
+        public System.Threading.Tasks.Task<bool> CreateNetworkAsync(string networkName, System.Collections.ObjectModel.ObservableCollection<NumberRecognizer.Cloud.Contract.Data.TrainingImage> individualTrainingsData) {
+            return base.Channel.CreateNetworkAsync(networkName, individualTrainingsData);
+        }
+
+        public System.Threading.Tasks.Task<bool> CreateNetworkWithTrainingDataCopyAsync(string networkName, System.Collections.ObjectModel.ObservableCollection<NumberRecognizer.Cloud.Contract.Data.TrainingImage> individualTrainingsData, int copyTraindataFromNetworkId) {
+            return base.Channel.CreateNetworkWithTrainingDataCopyAsync(networkName, individualTrainingsData, copyTraindataFromNetworkId);
         }
 
-        public System.Threading.Tasks.Task<bool> CreateNetworkWithTrainingDataCopyAsync(string networkName, string username, System.Collections.ObjectModel.ObservableCollection<NumberRecognizer.Cloud.Contract.Data.TrainingImage> individualTrainingsData, int copyTraindataFromNetworkId) {
-            return base.Channel.CreateNetworkWithTrainingDataCopyAsync(networkName, username, individualTrainingsData, copyTraindataFromNetworkId);
+        public System.Threading.Tasks.Task<bool> DeleteNetworkAsync(int networkId) {
+            return base.Channel.DeleteNetworkAsync(networkId);
         }
 
         public System.Threading.Tasks.Task<NumberRecognizer.Cloud.Contract.Data.NumberRecognitionResult> RecognizePhoneNumberAsync(int networkId, System.Collections.ObjectModel.ObservableCollection<NumberRecognizer.Cloud.Contract.Data.RecognitionImage> imageData) {
@@ -113,7 +120,7 @@ private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(Endpoi
 
         private static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration) {
             if ((endpointConfiguration == EndpointConfiguration.BasicHttpBinding_INumberRecognizerService)) {
-                return new System.ServiceModel.EndpointAddress("http://4574b9813eec49b598955c6a87e643e2.cloudapp.net/NumberRecognizerService.svc");
+                return new System.ServiceModel.EndpointAddress("http://0d832919582344d9b6d490f5aca905d8.cloudapp.net/NumberRecognizerService.svc");
             }
             throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration));
         }