No commit message

hauerCodes · Dec 14, 2014 · 31a34f4 · 31a34f4
1 parent 2500806
commit 31a34f4
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 74 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\NumberRecognizerService1.disco" />
-    <None Include="Service References\NumberRecognizerService\NumberRecognizerService1.wsdl" />
-    <None Include="Service References\NumberRecognizerService\NumberRecognizerService4.xsd">
+    <None Include="Service References\NumberRecognizerService\NumberRecognizerService.disco" />
+    <None Include="Service References\NumberRecognizerService\NumberRecognizerService.wsdl" />
+    <None Include="Service References\NumberRecognizerService\NumberRecognizerService.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Service References\NumberRecognizerService\NumberRecognizerService41.xsd">
+    <None Include="Service References\NumberRecognizerService\NumberRecognizerService1.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Service References\NumberRecognizerService\NumberRecognizerService42.xsd">
+    <None Include="Service References\NumberRecognizerService\NumberRecognizerService2.xsd">
       <SubType>Designer</SubType>
     </None>
-    <None Include="Service References\NumberRecognizerService\NumberRecognizerService43.xsd">
+    <None Include="Service References\NumberRecognizerService\NumberRecognizerService3.xsd">
       <SubType>Designer</SubType>
     </None>
     <None Include="Service References\NumberRecognizerService\Reference.svcmap">

diff --git a/...erRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService.disco b/...erRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService.disco
@@ -0,0 +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/" />
+</discovery>
diff --git a/...izerService/NumberRecognizerService1.wsdl → ...nizerService/NumberRecognizerService.wsdl b/...izerService/NumberRecognizerService1.wsdl → ...nizerService/NumberRecognizerService.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://numberrecognizer.cloudapp.net/NumberRecognizerService.svc?xsd=xsd0" namespace="http://tempuri.org/" />
-      <xsd:import schemaLocation="http://numberrecognizer.cloudapp.net/NumberRecognizerService.svc?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
-      <xsd:import schemaLocation="http://numberrecognizer.cloudapp.net/NumberRecognizerService.svc?xsd=xsd2" namespace="http://schemas.datacontract.org/2004/07/NumberRecognizer.Cloud.Contract.Data" />
-      <xsd:import schemaLocation="http://numberrecognizer.cloudapp.net/NumberRecognizerService.svc?xsd=xsd3" namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
+      <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:schema>
   </wsdl:types>
   <wsdl:message name="INumberRecognizerService_GetNetworks_InputMessage">
@@ -91,7 +91,7 @@
   </wsdl:binding>
   <wsdl:service name="NumberRecognizerService">
     <wsdl:port name="BasicHttpBinding_INumberRecognizerService" binding="tns:BasicHttpBinding_INumberRecognizerService">
-      <soap:address location="http://numberrecognizer.cloudapp.net/NumberRecognizerService.svc" />
+      <soap:address location="http://4574b9813eec49b598955c6a87e643e2.cloudapp.net/NumberRecognizerService.svc" />
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>
diff --git a/...izerService/NumberRecognizerService43.xsd → ...gnizerService/NumberRecognizerService.xsd b/...izerService/NumberRecognizerService43.xsd → ...gnizerService/NumberRecognizerService.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://numberrecognizer.cloudapp.net/NumberRecognizerService.svc?xsd=xsd2" namespace="http://schemas.datacontract.org/2004/07/NumberRecognizer.Cloud.Contract.Data" />
-  <xs:import schemaLocation="http://numberrecognizer.cloudapp.net/NumberRecognizerService.svc?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
+  <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:complexType name="ArrayOfKeyValueOfstringdouble">
     <xs:annotation>
       <xs:appinfo>

diff --git a/...rRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService1.disco b/...rRecognizer.App/Service References/NumberRecognizerService/NumberRecognizerService1.disco
diff --git a/...izerService/NumberRecognizerService42.xsd → ...nizerService/NumberRecognizerService1.xsd b/...izerService/NumberRecognizerService42.xsd → ...nizerService/NumberRecognizerService1.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://numberrecognizer.cloudapp.net/NumberRecognizerService.svc?xsd=xsd3" namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
+  <xs:import schemaLocation="http://4574b9813eec49b598955c6a87e643e2.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" />

diff --git a/...nizerService/NumberRecognizerService4.xsd → ...nizerService/NumberRecognizerService2.xsd b/...nizerService/NumberRecognizerService4.xsd → ...nizerService/NumberRecognizerService2.xsd
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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://numberrecognizer.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=xsd2" namespace="http://schemas.datacontract.org/2004/07/NumberRecognizer.Cloud.Contract.Data" />
   <xs:element name="GetNetworks">
     <xs:complexType>
       <xs:sequence />
@@ -13,7 +13,7 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="ValidateTrainingData">
+  <xs:element name="CreateNetwork">
     <xs:complexType>
       <xs:sequence>
         <xs:element minOccurs="0" name="networkName" nillable="true" type="xs:string" />
@@ -22,14 +22,14 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="ValidateTrainingDataResponse">
+  <xs:element name="CreateNetworkResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element minOccurs="0" name="ValidateTrainingDataResult" type="xs:boolean" />
+        <xs:element minOccurs="0" name="CreateNetworkResult" type="xs:boolean" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="ValidateTrainingDataWithTrainingDataCopy">
+  <xs:element name="CreateNetworkWithTrainingDataCopy">
     <xs:complexType>
       <xs:sequence>
         <xs:element minOccurs="0" name="networkName" nillable="true" type="xs:string" />
@@ -39,10 +39,10 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="ValidateTrainingDataWithTrainingDataCopyResponse">
+  <xs:element name="CreateNetworkWithTrainingDataCopyResponse">
     <xs:complexType>
       <xs:sequence>
-        <xs:element minOccurs="0" name="ValidateTrainingDataWithTrainingDataCopyResult" type="xs:boolean" />
+        <xs:element minOccurs="0" name="CreateNetworkWithTrainingDataCopyResult" type="xs:boolean" />
       </xs:sequence>
     </xs:complexType>
   </xs:element>

diff --git a/...izerService/NumberRecognizerService41.xsd → ...nizerService/NumberRecognizerService3.xsd b/...izerService/NumberRecognizerService41.xsd → ...nizerService/NumberRecognizerService3.xsd
diff --git a/...erRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/Reference.cs b/...erRecognizer/NumberRecognizer.App/Service References/NumberRecognizerService/Reference.cs
@@ -21,7 +21,7 @@ public interface INumberRecognizerService {
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/INumberRecognizerService/GetNetworks", ReplyAction="http://tempuri.org/INumberRecognizerService/GetNetworksResponse")]
         System.Threading.Tasks.Task<System.Collections.ObjectModel.ObservableCollection<NumberRecognizer.Cloud.Contract.Data.NetworkInfo>> GetNetworksAsync();
 
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/INumberRecognizerService/ValidateTrainingData", ReplyAction="http://tempuri.org/INumberRecognizerService/CreateNetworkResponse")]
+        [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.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/INumberRecognizerService/CreateNetworkWithTrainingDataCopy", ReplyAction="http://tempuri.org/INumberRecognizerService/CreateNetworkWithTrainingDataCopyResp" +
@@ -113,7 +113,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://numberrecognizer.cloudapp.net/NumberRecognizerService.svc");
+                return new System.ServiceModel.EndpointAddress("http://4574b9813eec49b598955c6a87e643e2.cloudapp.net/NumberRecognizerService.svc");
             }
             throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration));
         }

diff --git a/...cognizer/NumberRecognizer.App/Service References/NumberRecognizerService/Reference.svcmap b/...cognizer/NumberRecognizer.App/Service References/NumberRecognizerService/Reference.svcmap
@@ -21,15 +21,15 @@
     <ServiceContractMappings />
   </ClientOptions>
   <MetadataSources>
-    <MetadataSource Address="http://numberrecognizer.cloudapp.net/NumberRecognizerService.svc" Protocol="http" SourceId="1" />
+    <MetadataSource Address="http://4574b9813eec49b598955c6a87e643e2.cloudapp.net/NumberRecognizerService.svc" Protocol="http" SourceId="1" />
   </MetadataSources>
   <Metadata>
-    <MetadataFile FileName="NumberRecognizerService4.xsd" MetadataType="Schema" ID="d9528bd5-0114-4a8b-abf9-1973d49f5d32" SourceId="1" SourceUrl="http://numberrecognizer.cloudapp.net/NumberRecognizerService.svc?xsd=xsd0" />
-    <MetadataFile FileName="NumberRecognizerService41.xsd" MetadataType="Schema" ID="eff4e915-ec5b-45dd-a634-673c52ee85fb" SourceId="1" SourceUrl="http://numberrecognizer.cloudapp.net/NumberRecognizerService.svc?xsd=xsd1" />
-    <MetadataFile FileName="NumberRecognizerService42.xsd" MetadataType="Schema" ID="0d66af27-69fe-49f0-b3c1-0c0fc943ee52" SourceId="1" SourceUrl="http://numberrecognizer.cloudapp.net/NumberRecognizerService.svc?xsd=xsd2" />
-    <MetadataFile FileName="NumberRecognizerService43.xsd" MetadataType="Schema" ID="99ce3e42-1064-4882-9186-a6acb7dc5371" SourceId="1" SourceUrl="http://numberrecognizer.cloudapp.net/NumberRecognizerService.svc?xsd=xsd3" />
-    <MetadataFile FileName="NumberRecognizerService1.disco" MetadataType="Disco" ID="c07c47e3-beca-4c5b-9e99-52c911f23135" SourceId="1" SourceUrl="http://numberrecognizer.cloudapp.net/NumberRecognizerService.svc?disco" />
-    <MetadataFile FileName="NumberRecognizerService1.wsdl" MetadataType="Wsdl" ID="84aed694-38da-4879-8f96-87885052773e" SourceId="1" SourceUrl="http://numberrecognizer.cloudapp.net/NumberRecognizerService.svc?wsdl" />
+    <MetadataFile FileName="NumberRecognizerService.xsd" MetadataType="Schema" ID="d85dc965-9ce5-4884-8c9e-d567373cc670" SourceId="1" SourceUrl="http://4574b9813eec49b598955c6a87e643e2.cloudapp.net/NumberRecognizerService.svc?xsd=xsd3" />
+    <MetadataFile FileName="NumberRecognizerService1.xsd" MetadataType="Schema" ID="445e645e-186b-4a7e-85c1-25690cb717e6" SourceId="1" SourceUrl="http://4574b9813eec49b598955c6a87e643e2.cloudapp.net/NumberRecognizerService.svc?xsd=xsd2" />
+    <MetadataFile FileName="NumberRecognizerService.disco" MetadataType="Disco" ID="a0ca1837-77f8-4208-8f3a-18ddfd8447dc" SourceId="1" SourceUrl="http://4574b9813eec49b598955c6a87e643e2.cloudapp.net/NumberRecognizerService.svc?disco" />
+    <MetadataFile FileName="NumberRecognizerService2.xsd" MetadataType="Schema" ID="852ba78c-ad16-4af7-a90a-c37b27ba2246" SourceId="1" SourceUrl="http://4574b9813eec49b598955c6a87e643e2.cloudapp.net/NumberRecognizerService.svc?xsd=xsd0" />
+    <MetadataFile FileName="NumberRecognizerService.wsdl" MetadataType="Wsdl" ID="38218167-0fd0-49bb-8acb-1ee571e2a433" SourceId="1" SourceUrl="http://4574b9813eec49b598955c6a87e643e2.cloudapp.net/NumberRecognizerService.svc?wsdl" />
+    <MetadataFile FileName="NumberRecognizerService3.xsd" MetadataType="Schema" ID="02d3d0e1-6ef6-4c5a-b4d3-26817ece073a" SourceId="1" SourceUrl="http://4574b9813eec49b598955c6a87e643e2.cloudapp.net/NumberRecognizerService.svc?xsd=xsd1" />
   </Metadata>
   <Extensions>
     <ExtensionFile FileName="configuration91.svcinfo" Name="configuration91.svcinfo" />

diff --git a/NumberRecognizer/NumberRecognizer.Cloud.Contract/Data/NetworkInfo.cs b/NumberRecognizer/NumberRecognizer.Cloud.Contract/Data/NetworkInfo.cs
@@ -31,15 +31,6 @@ public class NetworkInfo
         [DataMember]
         public string NetworkName{ get; set; }
 
-        /// <summary>
-        /// Gets or sets the username.
-        /// </summary>
-        /// <value>
-        /// The username.
-        /// </value>
-        [DataMember]
-        public string Username{ get; set; }
-
         /// <summary>
         /// Gets or sets a value indicating whether the network is 
         /// calculated/trained and can recognize numbers.

diff --git a/NumberRecognizer/NumberRecognizer.Cloud.Contract/INumberRecognizerService.cs b/NumberRecognizer/NumberRecognizer.Cloud.Contract/INumberRecognizerService.cs
@@ -27,22 +27,20 @@ public interface INumberRecognizerService
         /// Creates the network.
         /// </summary>
         /// <param name="networkName">Name of the network.</param>
-        /// <param name="username">The username.</param>
         /// <param name="individualTrainingsData">The individual trainings data.</param>
         /// <returns></returns>
         [OperationContract]
-        bool CreateNetwork(string networkName, string username, IEnumerable<TrainingImage> individualTrainingsData);
+        bool CreateNetwork(string networkName, IEnumerable<TrainingImage> individualTrainingsData);
 
         /// <summary>
         /// Creates the network and copies the training data from a previous network.
         /// </summary>
         /// <param name="networkName">Name of the network.</param>
-        /// <param name="username">The username.</param>
         /// <param name="individualTrainingsData">The individual trainings data.</param>
         /// <param name="copyTraindataFromNetworkId">The copy traindata from network identifier.</param>
         /// <returns></returns>
         [OperationContract]
-        bool CreateNetworkWithTrainingDataCopy(string networkName, string username, IEnumerable<TrainingImage> individualTrainingsData, int copyTraindataFromNetworkId);
+        bool CreateNetworkWithTrainingDataCopy(string networkName, IEnumerable<TrainingImage> individualTrainingsData, int copyTraindataFromNetworkId);
 
         /// <summary>
         /// Deletes the network.

diff --git a/NumberRecognizer/NumberRecognizer.Cloud.Service/NumberRecognizerService.svc.cs b/NumberRecognizer/NumberRecognizer.Cloud.Service/NumberRecognizerService.svc.cs
@@ -104,7 +104,7 @@ public IList<NetworkInfo> GetNetworks()
         /// <param name="username">The username.</param>
         /// <param name="individualTrainingsData">The individual trainings data.</param>
         /// <returns></returns>
-        public bool CreateNetwork(string networkName, string username,  IEnumerable<TrainingImage> individualTrainingsData)
+        public bool CreateNetwork(string networkName, IEnumerable<TrainingImage> individualTrainingsData)
         {
             bool status = true;
             DataSerializer<double[,]> serializer = new DataSerializer<double[,]>();
@@ -167,7 +167,7 @@ public bool CreateNetwork(string networkName, string username,  IEnumerable<Trai
         /// <param name="copyTraindataFromNetworkId">The copy traindata from network identifier.</param>
         /// <returns></returns>
         /// <exception cref="System.NotImplementedException"></exception>
-        public bool CreateNetworkWithTrainingDataCopy(string networkName, string username, IEnumerable<TrainingImage> individualTrainingsData, int copyTraindataFromNetworkId)
+        public bool CreateNetworkWithTrainingDataCopy(string networkName, IEnumerable<TrainingImage> individualTrainingsData, int copyTraindataFromNetworkId)
         {
             bool status = true;
             DataSerializer<double[,]> serializer = new DataSerializer<double[,]>();