From: <Or...@us...> - 2008-06-03 21:41:05
|
Revision: 209 http://acmcontester.svn.sourceforge.net/acmcontester/?rev=209&view=rev Author: Oracle_ Date: 2008-06-03 14:41:11 -0700 (Tue, 03 Jun 2008) Log Message: ----------- Added TL coefficients. Modified Paths: -------------- ACMServer/branches/Version_2/Server/IniData.txt ACMServer/branches/Version_2/Server/MainUnit.pas Modified: ACMServer/branches/Version_2/Server/IniData.txt =================================================================== --- ACMServer/branches/Version_2/Server/IniData.txt 2008-06-03 21:17:32 UTC (rev 208) +++ ACMServer/branches/Version_2/Server/IniData.txt 2008-06-03 21:41:11 UTC (rev 209) @@ -7,4 +7,5 @@ 60000 Visualization Info: True -ACM: True \ No newline at end of file +ACM: True +0.5 0 Modified: ACMServer/branches/Version_2/Server/MainUnit.pas =================================================================== --- ACMServer/branches/Version_2/Server/MainUnit.pas 2008-06-03 21:17:32 UTC (rev 208) +++ ACMServer/branches/Version_2/Server/MainUnit.pas 2008-06-03 21:41:11 UTC (rev 209) @@ -82,9 +82,9 @@ NeedVisualization, ACM_Compilating:boolean; TestingSource : RTL_CRITICAL_SECTION; + TLk,TLx:Extended; - implementation uses Math; @@ -192,7 +192,7 @@ while s[1]=' ' do delete(s,1,1); ACM_Compilating:=LowerCase(s)='true'; - +Readln(f,TLk,TLx); closefile(f); if IOResult<>0 then @@ -500,7 +500,7 @@ LLog.add('TestSingleSourceFile'); RLog.Add('Start Test: ID='+inttostr(info.SubmitID)+' ProblemNumber='+inttostr(info.ProblemNumber)+' Login='+Info.Login); -RLog.Add(' TimeLimit='+floattostr(Info.Limits.TimeLimit/1000)+' s. MemoryLimit='+inttostr(info.Limits.MemoryLimit div 1024)+' KB'); +RLog.Add(' TimeLimit='+floattostr((Info.Limits.TimeLimit*TLk+TLx)/1000)+' s. MemoryLimit='+inttostr(info.Limits.MemoryLimit div 1024)+' KB'); Res:=CompileFile(SourcePath,Info.Language,ProgramPath); @@ -617,7 +617,7 @@ LLog.Add('ML='+inttostr(ML)); RunResult:=Run( ExeFile, TestFile, ResultFile, ExtractFilePath(ExeFile), - Limits.TimeLimit, ML, Limits.OutputLimit, WorkedTime, UsedMemory); + Round(Limits.TimeLimit*TLk+TLx), ML, Limits.OutputLimit, WorkedTime, UsedMemory); LLog.Add('End Testing RUN'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |