Changeset 14196


Ignore:
Timestamp:
07/23/16 08:58:27 (8 months ago)
Author:
abeham
Message:

#2644: upgraded Sim# version from 3.0.7 to 3.0.9

Location:
trunk/sources
Files:
5 deleted
11 edited
5 copied
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.ExtLibs.sln

    r14125 r14196  
    6767Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.EPPlus-4.0.3", "HeuristicLab.ExtLibs\HeuristicLab.EPPlus\4.0.3\HeuristicLab.EPPlus-4.0.3\HeuristicLab.EPPlus-4.0.3.csproj", "{675A6EE4-DE7C-413E-8BEF-EB21E0384C87}"
    6868EndProject
    69 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimSharp-3.0.7", "HeuristicLab.ExtLibs\HeuristicLab.SimSharp\3.0.7\SimSharp-3.0.7\SimSharp-3.0.7.csproj", "{9FE9C740-7859-4D01-AD07-7D4E15A6320B}"
    70 EndProject
    71 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.SimSharp-3.0.7", "HeuristicLab.ExtLibs\HeuristicLab.SimSharp\3.0.7\HeuristicLab.SimSharp-3.0.7\HeuristicLab.SimSharp-3.0.7.csproj", "{5C93CAF7-AE6A-4540-95B2-5DA6761A2677}"
     69Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimSharp-3.0.9", "HeuristicLab.ExtLibs\HeuristicLab.SimSharp\3.0.9\SimSharp-3.0.9\SimSharp-3.0.9.csproj", "{9FE9C740-7859-4D01-AD07-7D4E15A6320B}"
     70EndProject
     71Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.SimSharp-3.0.9", "HeuristicLab.ExtLibs\HeuristicLab.SimSharp\3.0.9\HeuristicLab.SimSharp-3.0.9\HeuristicLab.SimSharp-3.0.9.csproj", "{5C93CAF7-AE6A-4540-95B2-5DA6761A2677}"
    7272EndProject
    7373Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.MathJax-2.6.1", "HeuristicLab.ExtLibs\HeuristicLab.MathJax\2.6.1\HeuristicLab.MathJax-2.6.1\HeuristicLab.MathJax-2.6.1.csproj", "{BCDA17A6-5B4A-495C-B182-E856CA081BE6}"
  • trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.9/HeuristicLab.SimSharp-3.0.9/HeuristicLab.SimSharp-3.0.9.csproj

    r14195 r14196  
    99    <AppDesignerFolder>Properties</AppDesignerFolder>
    1010    <RootNamespace>HeuristicLab.SimSharp</RootNamespace>
    11     <AssemblyName>HeuristicLab.SimSharp-3.0.7</AssemblyName>
     11    <AssemblyName>HeuristicLab.SimSharp-3.0.9</AssemblyName>
    1212    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
     
    9292      <Private>False</Private>
    9393    </ProjectReference>
    94     <ProjectReference Include="..\SimSharp-3.0.7\SimSharp-3.0.7.csproj">
     94    <ProjectReference Include="..\SimSharp-3.0.9\SimSharp-3.0.9.csproj">
    9595      <Project>{9fe9c740-7859-4d01-ad07-7d4e15a6320b}</Project>
    96       <Name>SimSharp-3.0.7</Name>
     96      <Name>SimSharp-3.0.9</Name>
    9797    </ProjectReference>
    9898  </ItemGroup>
    9999  <ItemGroup>
    100     <Content Include="SimSharp-3.0.7 License.txt">
     100    <Content Include="SimSharp-3.0.9 License.txt">
    101101      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    102102    </Content>
  • trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.9/HeuristicLab.SimSharp-3.0.9/Plugin.cs.frame

    r14185 r14196  
    2323
    2424namespace HeuristicLab.SimSharp {
    25   [Plugin("HeuristicLab.SimSharp", "Transport plugin for the simulation framework Sim#", "3.0.7.$WCREV$")]
    26   [PluginFile("HeuristicLab.SimSharp-3.0.7.dll", PluginFileType.Assembly)]
    27   [PluginFile("SimSharp-3.0.7.dll", PluginFileType.Assembly)]
    28   [PluginFile("SimSharp-3.0.7 License.txt", PluginFileType.License)]
     25  [Plugin("HeuristicLab.SimSharp", "Transport plugin for the simulation framework Sim#", "3.0.9.$WCREV$")]
     26  [PluginFile("HeuristicLab.SimSharp-3.0.9.dll", PluginFileType.Assembly)]
     27  [PluginFile("SimSharp-3.0.9.dll", PluginFileType.Assembly)]
     28  [PluginFile("SimSharp-3.0.9 License.txt", PluginFileType.License)]
    2929  public class HeuristicLabSimSharpPlugin : PluginBase {
    3030  }
  • trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.9/HeuristicLab.SimSharp-3.0.9/Properties/AssemblyInfo.cs.frame

    r14171 r14196  
    55// set of attributes. Change these attribute values to modify the information
    66// associated with an assembly.
    7 [assembly: AssemblyTitle("HeuristicLab.SimSharp-3.0.7")]
     7[assembly: AssemblyTitle("HeuristicLab.SimSharp-3.0.9")]
    88[assembly: AssemblyDescription("Transport plugin for the simulation framework Sim#")]
    99[assembly: AssemblyConfiguration("")]
     
    3232// by using the '*' as shown below:
    3333// [assembly: AssemblyVersion("1.0.*")]
    34 [assembly: AssemblyVersion("3.0.7.0")]
    35 [assembly: AssemblyFileVersion("3.0.7.$WCREV$")]
     34[assembly: AssemblyVersion("3.0.9.0")]
     35[assembly: AssemblyFileVersion("3.0.9.$WCREV$")]
  • trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.9/SimSharp-3.0.9/Core/Environment.cs

    r14185 r14196  
    109109
    110110    public virtual void Reset(int randomSeed) {
     111      ProcessedEvents = 0;
    111112      Now = StartDate;
    112113      Random = new SystemRandom(randomSeed);
  • trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.9/SimSharp-3.0.9/Core/Events/AllOf.cs

    r12657 r14196  
    1 
     1#region License Information
     2/* SimSharp - A .NET port of SimPy, discrete event simulation framework
     3Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4
     5This program is free software: you can redistribute it and/or modify
     6it under the terms of the GNU General Public License as published by
     7the Free Software Foundation, either version 3 of the License, or
     8(at your option) any later version.
     9
     10This program is distributed in the hope that it will be useful,
     11but WITHOUT ANY WARRANTY; without even the implied warranty of
     12MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     13GNU General Public License for more details.
     14
     15You should have received a copy of the GNU General Public License
     16along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
     17#endregion
     18
    219using System.Collections.Generic;
    320
  • trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.9/SimSharp-3.0.9/Core/Events/AnyOf.cs

    r12657 r14196  
    1 
     1#region License Information
     2/* SimSharp - A .NET port of SimPy, discrete event simulation framework
     3Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4
     5This program is free software: you can redistribute it and/or modify
     6it under the terms of the GNU General Public License as published by
     7the Free Software Foundation, either version 3 of the License, or
     8(at your option) any later version.
     9
     10This program is distributed in the hope that it will be useful,
     11but WITHOUT ANY WARRANTY; without even the implied warranty of
     12MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     13GNU General Public License for more details.
     14
     15You should have received a copy of the GNU General Public License
     16along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
     17#endregion
     18
    219using System.Collections.Generic;
    320
  • trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.9/SimSharp-3.0.9/Core/Resources/PreemptiveResource.cs

    r14185 r14196  
    8989
    9090    protected virtual void DoRelease(Release release) {
    91       Users.Remove(release.Request);
     91      if (!Users.Remove(release.Request)) {
     92        var preemptRequest = release.Request as PreemptiveRequest;
     93        if (preemptRequest != null) {
     94          var current = RequestQueue[preemptRequest.Priority].First;
     95          while (current != null && current.Value != release.Request)
     96            current = current.Next;
     97          if (current != null) RequestQueue[preemptRequest.Priority].Remove(current);
     98        }
     99      }
    92100      release.Succeed();
    93101    }
  • trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.9/SimSharp-3.0.9/Core/Resources/PriorityResource.cs

    r14185 r14196  
    1919using System;
    2020using System.Collections.Generic;
    21 using System.Linq;
    2221
    2322namespace SimSharp {
     
    3231    protected Environment Environment { get; private set; }
    3332
    34     protected SortedList<int, Queue<PriorityRequest>> RequestQueue { get; private set; }
     33    protected SortedList<int, LinkedList<PriorityRequest>> RequestQueue { get; private set; }
    3534    protected Queue<Release> ReleaseQueue { get; private set; }
    3635    protected HashSet<Request> Users { get; private set; }
     
    4039      Environment = environment;
    4140      Capacity = capacity;
    42       RequestQueue = new SortedList<int, Queue<PriorityRequest>>();
     41      RequestQueue = new SortedList<int, LinkedList<PriorityRequest>>();
    4342      ReleaseQueue = new Queue<Release>();
    4443      Users = new HashSet<Request>();
     
    4847      var request = new PriorityRequest(Environment, TriggerRelease, DisposeCallback, priority);
    4948      if (!RequestQueue.ContainsKey(priority))
    50         RequestQueue.Add(priority, new Queue<PriorityRequest>());
    51       RequestQueue[priority].Enqueue(request);
     49        RequestQueue.Add(priority, new LinkedList<PriorityRequest>());
     50      RequestQueue[priority].AddLast(request);
    5251      TriggerRequest();
    5352      return request;
     
    7473
    7574    protected virtual void DoRelease(Release release) {
    76       Users.Remove(release.Request);
     75      if (!Users.Remove(release.Request)) {
     76        var prioRequest = release.Request as PriorityRequest;
     77        if (prioRequest != null) {
     78          var current = RequestQueue[prioRequest.Priority].First;
     79          while (current != null && current.Value != release.Request)
     80            current = current.Next;
     81          if (current != null) RequestQueue[prioRequest.Priority].Remove(current);
     82        }
     83      }
    7784      release.Succeed();
    7885    }
     
    8390        var requests = entry.Value;
    8491        while (requests.Count > 0) {
    85           var req = requests.Peek();
     92          var req = requests.First.Value;
    8693          DoRequest(req);
    8794          if (req.IsTriggered) {
    88             requests.Dequeue();
     95            requests.RemoveFirst();
    8996          } else {
    9097            cascade = true;
  • trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.9/SimSharp-3.0.9/Core/Resources/Resource.cs

    r14185 r14196  
    1919using System;
    2020using System.Collections.Generic;
    21 using System.Linq;
    2221
    2322namespace SimSharp {
     
    3231    protected Environment Environment { get; private set; }
    3332
    34     protected Queue<Request> RequestQueue { get; private set; }
     33    protected LinkedList<Request> RequestQueue { get; private set; }
    3534    protected Queue<Release> ReleaseQueue { get; private set; }
    3635    protected HashSet<Request> Users { get; private set; }
     
    4039      Environment = environment;
    4140      Capacity = capacity;
    42       RequestQueue = new Queue<Request>();
     41      RequestQueue = new LinkedList<Request>();
    4342      ReleaseQueue = new Queue<Release>();
    4443      Users = new HashSet<Request>();
     
    4746    public virtual Request Request() {
    4847      var request = new Request(Environment, TriggerRelease, DisposeCallback);
    49       RequestQueue.Enqueue(request);
     48      RequestQueue.AddLast(request);
    5049      TriggerRequest();
    5150      return request;
     
    6160    protected virtual void DisposeCallback(Event @event) {
    6261      var request = @event as Request;
    63       if (request != null) Release(request);
     62      if (request != null) {
     63        Release(request);
     64      }
    6465    }
    6566
     
    7273
    7374    protected virtual void DoRelease(Release release) {
    74       Users.Remove(release.Request);
     75      if (!Users.Remove(release.Request)) {
     76        var current = RequestQueue.First;
     77        while (current != null && current.Value != release.Request)
     78          current = current.Next;
     79        if (current != null) RequestQueue.Remove(current);
     80      }
    7581      release.Succeed();
    7682    }
     
    7884    protected virtual void TriggerRequest(Event @event = null) {
    7985      while (RequestQueue.Count > 0) {
    80         var request = RequestQueue.Peek();
     86        var request = RequestQueue.First.Value;
    8187        DoRequest(request);
    8288        if (request.IsTriggered) {
    83           RequestQueue.Dequeue();
     89          RequestQueue.RemoveFirst();
    8490        } else break;
    8591      }
  • trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.9/SimSharp-3.0.9/Properties/AssemblyInfo.cs

    r14185 r14196  
    2828[assembly: AssemblyCompany("HEAL")]
    2929[assembly: AssemblyProduct("SimSharp")]
    30 [assembly: AssemblyCopyright("Copyright © HEAL 2015")]
     30[assembly: AssemblyCopyright("Copyright © HEAL 2016")]
    3131[assembly: AssemblyTrademark("")]
    3232[assembly: AssemblyCulture("")]
     
    5050// by using the '*' as shown below:
    5151// [assembly: AssemblyVersion("1.0.*")]
    52 [assembly: AssemblyVersion("3.0.7.0")]
    53 [assembly: AssemblyFileVersion("3.0.7.0")]
     52[assembly: AssemblyVersion("3.0.9.0")]
     53[assembly: AssemblyFileVersion("3.0.9.0")]
  • trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.9/SimSharp-3.0.9/Random/IRandom.cs

    r14185 r14196  
    1 
    2 #region License Information
     1#region License Information
    32/* SimSharp - A .NET port of SimPy, discrete event simulation framework
    43Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  • trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SimSharp/3.0.9/SimSharp-3.0.9/SimSharp-3.0.9.csproj

    r14195 r14196  
    99    <AppDesignerFolder>Properties</AppDesignerFolder>
    1010    <RootNamespace>SimSharp</RootNamespace>
    11     <AssemblyName>SimSharp-3.0.7</AssemblyName>
     11    <AssemblyName>SimSharp-3.0.9</AssemblyName>
    1212    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
     
    3434    <ErrorReport>prompt</ErrorReport>
    3535    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    36     <DocumentationFile>bin\Release\SimSharp-3.0.7.xml</DocumentationFile>
     36    <DocumentationFile>bin\Release\SimSharp-3.0.9.xml</DocumentationFile>
    3737  </PropertyGroup>
    3838  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     
    4848    <OutputPath>bin\x64\Release\</OutputPath>
    4949    <DefineConstants>TRACE</DefineConstants>
    50     <DocumentationFile>bin\Release\SimSharp-3.0.7.xml</DocumentationFile>
     50    <DocumentationFile>bin\Release\SimSharp-3.0.9.xml</DocumentationFile>
    5151    <Optimize>true</Optimize>
    5252    <DebugType>pdbonly</DebugType>
     
    6767    <OutputPath>bin\x86\Release\</OutputPath>
    6868    <DefineConstants>TRACE</DefineConstants>
    69     <DocumentationFile>bin\Release\SimSharp-3.0.7.xml</DocumentationFile>
     69    <DocumentationFile>bin\Release\SimSharp-3.0.9.xml</DocumentationFile>
    7070    <Optimize>true</Optimize>
    7171    <DebugType>pdbonly</DebugType>
Note: See TracChangeset for help on using the changeset viewer.