Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/18/14 13:34:37 (10 years ago)
Author:
ascheibe
Message:

merged only Hive changes from trunk into branch

Location:
branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient

    • Property svn:mergeinfo set to (toggle deleted branches)
      /trunk/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClientmergedeligible
      /branches/Algorithms.GradientDescent/HeuristicLab.Clients.Hive.Slave.ConsoleClient5516-5520
      /branches/Benchmarking/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient6917-7005
      /branches/CloningRefactoring/HeuristicLab.Clients.Hive.Slave.ConsoleClient4656-4721
      /branches/DataAnalysis Refactoring/HeuristicLab.Clients.Hive.Slave.ConsoleClient5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Clients.Hive.Slave.ConsoleClient5815-6180
      /branches/DataAnalysis/HeuristicLab.Clients.Hive.Slave.ConsoleClient4458-4459,​4462,​4464
      /branches/GP.Grammar.Editor/HeuristicLab.Clients.Hive.Slave.ConsoleClient6284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Clients.Hive.Slave.ConsoleClient5060
      /branches/NET40/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient5138-5162
      /branches/ParallelEngine/HeuristicLab.Clients.Hive.Slave.ConsoleClient5175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Clients.Hive.Slave.ConsoleClient7568-7810
      /branches/QAPAlgorithms/HeuristicLab.Clients.Hive.Slave.ConsoleClient6350-6627
      /branches/Restructure trunk solution/HeuristicLab.Clients.Hive.Slave.ConsoleClient6828
      /branches/RuntimeOptimizer/HeuristicLab.Clients.Hive.Slave.ConsoleClient8943-9078
      /branches/ScatterSearch (trunk integration)/HeuristicLab.Clients.Hive.Slave.ConsoleClient7787-8333
      /branches/SlaveShutdown/HeuristicLab.Clients.Hive.Slave.ConsoleClient8944-8956
      /branches/SuccessProgressAnalysis/HeuristicLab.Clients.Hive.Slave.ConsoleClient5370-5682
      /branches/Trunk/HeuristicLab.Clients.Hive.Slave.ConsoleClient6829-6865
      /branches/UnloadJobs/HeuristicLab.Clients.Hive.Slave.ConsoleClient9168-9215
      /branches/VNS/HeuristicLab.Clients.Hive.Slave.ConsoleClient5594-5752
      /branches/histogram/HeuristicLab.Clients.Hive.Slave.ConsoleClient5959-6341

  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/Program.cs

    r11203 r11204  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/Properties/AssemblyInfo.cs.frame

    r11203 r11204  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3232[assembly: AssemblyCompany("")]
    3333[assembly: AssemblyProduct("HeuristicLab")]
    34 [assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
     34[assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
    3535[assembly: AssemblyTrademark("")]
    3636[assembly: AssemblyCulture("")]
    … …  
    5555// [assembly: AssemblyVersion("1.0.*")]
    5656[assembly: AssemblyVersion("3.3.0.0")]
    57 [assembly: AssemblyFileVersion("3.3.7.$WCREV$")]
     57[assembly: AssemblyFileVersion("3.3.10.$WCREV$")]

  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/SlaveCommListener.cs

    r11203 r11204  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/HiveStatistics/sources/HeuristicLab.Clients.Hive.Slave.ConsoleClient/3.3/app.config

    r11203 r11204  
    44    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
    55      <section name="HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     6      <section name="HeuristicLab.Clients.Hive.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
    67    </sectionGroup>
    78  </configSections>
    89  <runtime>
    910    <gcServer enabled="true" />
    10   </runtime>
     11  </runtime>     
    1112 
    1213  <system.serviceModel>
    … …  
    6667   
    6768 </system.serviceModel>
    68  
     69
    6970  <userSettings>
    7071    <HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
    71       <setting name="HeartbeatInterval" serializeAs="String">
    72         <value>00:00:20</value>
    73       </setting>
    7472      <setting name="LastUsedFileName" serializeAs="String">
    7573        <value>lastUsed.dat</value>
    … …  
    139137      </setting>
    140138      <setting name="NrOfCoresToScavenge" serializeAs="String">
    141         <value>2</value>
     139        <value>-1</value>
    142140      </setting>
    143141      <setting name="ShutdownCommand" serializeAs="String">
    144142        <value>shutdown.exe</value>
    145143      </setting>
    146    </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
     144      <setting name="HeartbeatInterval" serializeAs="String">
     145        <value>00:00:40</value>
     146      </setting>
     147    </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
     148    <HeuristicLab.Clients.Hive.Settings>
     149      <setting name="MaxParallelUploads" serializeAs="String">
     150        <value>2</value>
     151      </setting>
     152      <setting name="HLBinaryName" serializeAs="String">
     153        <value>HeuristicLab 3.3.exe</value>
     154      </setting>
     155      <setting name="ResultPollingInterval" serializeAs="String">
     156        <value>00:00:20</value>
     157      </setting>
     158      <setting name="MaxParallelDownloads" serializeAs="String">
     159        <value>2</value>
     160      </setting>
     161      <setting name="MaxRepeatServiceCalls" serializeAs="String">
     162        <value>5</value>
     163      </setting>
     164      <setting name="AnonymousUserName" serializeAs="String">
     165        <value>anonymous</value>
     166      </setting>
     167      <setting name="EndpointConfigurationPriorities" serializeAs="Xml">
     168        <value>
     169          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     170            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     171            <string>netTcpBinding_IHiveService</string>
     172            <string>wsHttpBinding_IHiveService</string>
     173          </ArrayOfString>
     174        </value>
     175      </setting>
     176      <setting name="MaxEndpointRetries" serializeAs="String">
     177        <value>3</value>
     178      </setting>
     179    </HeuristicLab.Clients.Hive.Settings>
    147180  </userSettings>
    148181<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
Note: See TracChangeset for help on using the changeset viewer.