[Acmcontester-developers] SF.net SVN: acmcontester:[477] ACMServer/trunk/ACMServer/Library

[<br...@us...>]

Revision: 477
          http://acmcontester.svn.sourceforge.net/acmcontester/?rev=477&view=rev
Author:   brus07
Date:     2009-02-02 15:59:55 +0000 (Mon, 02 Feb 2009)

Log Message:
-----------
Update ResultIoi. Now is good version.

Modified Paths:
--------------
    ACMServer/trunk/ACMServer/Library/Data/Data.csproj
    ACMServer/trunk/ACMServer/Library/Data/ResultIoi.cs
    ACMServer/trunk/ACMServer/Library/testData/data.xsd

Added Paths:
-----------
    ACMServer/trunk/ACMServer/Library/Data/TestResIoi.cs

Modified: ACMServer/trunk/ACMServer/Library/Data/Data.csproj
===================================================================
--- ACMServer/trunk/ACMServer/Library/Data/Data.csproj	2009-02-02 12:55:50 UTC (rev 476)
+++ ACMServer/trunk/ACMServer/Library/Data/Data.csproj	2009-02-02 15:59:55 UTC (rev 477)
@@ -40,6 +40,7 @@
     <Compile Include="Result.cs" />
     <Compile Include="Submit.cs" />
     <Compile Include="SubmitList.cs" />
+    <Compile Include="TestResIoi.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\LibraryExtention\LibraryExtention.csproj">

Modified: ACMServer/trunk/ACMServer/Library/Data/ResultIoi.cs
===================================================================
--- ACMServer/trunk/ACMServer/Library/Data/ResultIoi.cs	2009-02-02 12:55:50 UTC (rev 476)
+++ ACMServer/trunk/ACMServer/Library/Data/ResultIoi.cs	2009-02-02 15:59:55 UTC (rev 477)
@@ -3,10 +3,10 @@
 
 namespace AcmContester.Library.LibraryExtention.Data
 {
-    [XmlRoot("resultIoi")]
+    [XmlRoot("resultioi")]
     public class ResultIoi
     {
-        [XmlElement("submitIoi", typeof(Submit))]
+        [XmlElement("submitioi", typeof(SubmitIoi))]
         public SubmitIoi Submit
         {
             get
@@ -27,9 +27,15 @@
         public double usedTime;
         [XmlElement("usedMemory", typeof(int))]
         public int usedMemory;
+        [XmlElement("testResults", typeof(TestResIoi[]))]
+        public TestResIoi[] testResults;
 
         readonly string temp;
 
+        public ResultIoi()
+        {
+        }
+
         public ResultIoi(SubmitIoi ssubmit)
         {
             submit = ssubmit;
@@ -45,7 +51,7 @@
 
         public static ResultIoi CreateFromXml(string message)
         {
-            return XmlHelper.GetObject<ResultIoi>(message, "resultIoi", "data.xsd");
+            return XmlHelper.GetObject<ResultIoi>(message, "resultioi", "data.xsd");
         }
 
         public override string ToString()
@@ -56,5 +62,16 @@
         {
             return XmlSerializer<ResultIoi>.Serialization(this);
         }
+
+        public Result ToResult()
+        {
+            Result result = new Result();
+            result.res = res;
+            result.result = this.result;
+            result.usedMemory = usedMemory;
+            result.usedTime = usedTime;
+            result.Submit = this.Submit.submit;
+            return result;
+        }
     }
 }

Added: ACMServer/trunk/ACMServer/Library/Data/TestResIoi.cs
===================================================================
--- ACMServer/trunk/ACMServer/Library/Data/TestResIoi.cs	                        (rev 0)
+++ ACMServer/trunk/ACMServer/Library/Data/TestResIoi.cs	2009-02-02 15:59:55 UTC (rev 477)
@@ -0,0 +1,34 @@
+using System.Xml.Serialization;
+using AcmContester.AcmLibraryExtention.XML;
+
+namespace AcmContester.Library.LibraryExtention.Data
+{
+    [XmlRoot("testResultIoi")]
+    public class TestResIoi
+    {
+        [XmlElement("id", typeof(int))]
+        public int id;
+        [XmlElement("res", typeof(string))]
+        public string res;
+        [XmlElement("usedTime", typeof(double))]
+        public double usedTime;
+        [XmlElement("usedMemory", typeof(int))]
+        public int usedMemory;
+        [XmlElement("input", typeof(string))]
+        public string input;
+        [XmlElement("output", typeof(string))]
+        public string output;
+        [XmlElement("contestantOutput", typeof(string))]
+        public string contestantOutput;
+        [XmlElement("point", typeof(int))]
+        public int points;
+
+        public TestResIoi()
+        {
+            res = "";
+            input = "";
+            output = "";
+            contestantOutput = "";
+        }
+    }
+}
\ No newline at end of file

Modified: ACMServer/trunk/ACMServer/Library/testData/data.xsd
===================================================================
--- ACMServer/trunk/ACMServer/Library/testData/data.xsd	2009-02-02 12:55:50 UTC (rev 476)
+++ ACMServer/trunk/ACMServer/Library/testData/data.xsd	2009-02-02 15:59:55 UTC (rev 477)
@@ -41,10 +41,42 @@
       <xs:element name="submit" type="submitType" />
     </xs:sequence>
   </xs:complexType>
+  <xs:complexType name="resultIOIType">
+    <xs:sequence>
+      <xs:element name="res" type="xs:string" />
+      <xs:element name="result" type="xs:int" />
+      <xs:element name="usedTime" type="xs:double" />
+      <xs:element name="usedMemory" type="xs:double" />
+      <xs:element name="testResults" type="testResultList" />
+      <xs:element name="submitioi" type="submitIOIType" />
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="testResultList">
+    <xs:sequence>
+      <xs:sequence>
+        <xs:element name="TestResIoi" type="testResultIoiType" maxOccurs="unbounded" minOccurs="0" />
+      </xs:sequence>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="testResultIoiType">
+    <xs:sequence>
+      <!-- обмеження для ID: не має бути відємним -->
+      <xs:element name="id" type="xs:int" />
+      <xs:element name="res" type="xs:string" />
+      <xs:element name="usedTime" type="xs:double" />
+      <xs:element name="usedMemory" type="xs:double" />
+      <xs:element name="input" type="xs:string" />
+      <xs:element name="output" type="xs:string" />
+      <xs:element name="contestantOutput" type="xs:string" />
+      <xs:element name="point" type="xs:int" />
+    </xs:sequence>
+  </xs:complexType>
   <xs:element name="result" type="resultType">
   </xs:element>
   <xs:element name="submit" type="submitType">
   </xs:element>
   <xs:element name="submitioi" type="submitIOIType">
   </xs:element>
+  <xs:element name="resultioi" type="resultIOIType">
+  </xs:element>
 </xs:schema>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.