- Timestamp:
- 07/10/15 12:07:08 (9 years ago)
- Location:
- stable
- Files:
-
- 1 deleted
- 17 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 12074,12089-12090,12093,12095,12100-12101,12104,12178-12180
- Property svn:mergeinfo changed
-
stable/HeuristicLab.ExtLibs
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.ExtLibs merged: 12074,12100-12101,12104,12178-12180
- Property svn:mergeinfo changed
-
stable/HeuristicLab.ExtLibs.sln
r11937 r12707 2 2 Microsoft Visual Studio Solution File, Format Version 12.00 3 3 # Visual Studio 2013 4 VisualStudioVersion = 12.0. 21005.14 VisualStudioVersion = 12.0.31101.0 5 5 MinimumVisualStudioVersion = 10.0.40219.1 6 6 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.DayView-1.0", "HeuristicLab.ExtLibs\HeuristicLab.DayView\1.0\HeuristicLab.DayView-1.0.csproj", "{02766ECC-D0F5-4115-9ECA-47409167B638}" … … 41 41 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.ALGLIB-3.7.0", "HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.7.0\HeuristicLab.ALGLIB-3.7.0\HeuristicLab.ALGLIB-3.7.0.csproj", "{6F1D7847-D610-4E52-A184-405DAEFA41A9}" 42 42 EndProject 43 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EPPlus-3.1.3", "HeuristicLab.ExtLibs\HeuristicLab.EPPlus\3.1.3\EPPlus-3.1.3\EPPlus-3.1.3.csproj", "{7B288026-5502-4A39-BF41-77E086F3E4A3}"44 EndProject45 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.EPPlus-3.1.3", "HeuristicLab.ExtLibs\HeuristicLab.EPPlus\3.1.3\HeuristicLab.EPPlus-3.1.3\HeuristicLab.EPPlus-3.1.3.csproj", "{B8B9E73B-18DE-4781-8F31-D3472BA9DB66}"46 EndProject47 43 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetScilab-1.0", "HeuristicLab.ExtLibs\HeuristicLab.DotNetScilab\1.0\DotNetScilab-1.0\DotNetScilab-1.0.csproj", "{C3F0C7DC-82AD-405B-990A-BF2C5B7F46FF}" 48 44 EndProject … … 68 64 EndProject 69 65 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Xml-5.5.0", "HeuristicLab.ExtLibs\HeuristicLab.NRefactory\5.5.0\NRefactory.Xml-5.5.0\ICSharpCode.NRefactory.Xml-5.5.0.csproj", "{C5AE5D30-AE8C-4017-B741-99E084281000}" 66 EndProject 67 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EPPlus-4.0.3", "HeuristicLab.ExtLibs\HeuristicLab.EPPlus\4.0.3\EPPlus-4.0.3\EPPlus-4.0.3.csproj", "{832EA4F3-20F7-42D7-B079-B588BA559E5F}" 68 EndProject 69 Project("{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}" 70 70 EndProject 71 71 Global … … 271 271 {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Release|x86.ActiveCfg = Release|x86 272 272 {6F1D7847-D610-4E52-A184-405DAEFA41A9}.Release|x86.Build.0 = Release|x86 273 {7B288026-5502-4A39-BF41-77E086F3E4A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU274 {7B288026-5502-4A39-BF41-77E086F3E4A3}.Debug|Any CPU.Build.0 = Debug|Any CPU275 {7B288026-5502-4A39-BF41-77E086F3E4A3}.Debug|x64.ActiveCfg = Debug|x64276 {7B288026-5502-4A39-BF41-77E086F3E4A3}.Debug|x64.Build.0 = Debug|x64277 {7B288026-5502-4A39-BF41-77E086F3E4A3}.Debug|x86.ActiveCfg = Debug|x86278 {7B288026-5502-4A39-BF41-77E086F3E4A3}.Debug|x86.Build.0 = Debug|x86279 {7B288026-5502-4A39-BF41-77E086F3E4A3}.Release|Any CPU.ActiveCfg = Release|Any CPU280 {7B288026-5502-4A39-BF41-77E086F3E4A3}.Release|Any CPU.Build.0 = Release|Any CPU281 {7B288026-5502-4A39-BF41-77E086F3E4A3}.Release|x64.ActiveCfg = Release|x64282 {7B288026-5502-4A39-BF41-77E086F3E4A3}.Release|x64.Build.0 = Release|x64283 {7B288026-5502-4A39-BF41-77E086F3E4A3}.Release|x86.ActiveCfg = Release|x86284 {7B288026-5502-4A39-BF41-77E086F3E4A3}.Release|x86.Build.0 = Release|x86285 {B8B9E73B-18DE-4781-8F31-D3472BA9DB66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU286 {B8B9E73B-18DE-4781-8F31-D3472BA9DB66}.Debug|Any CPU.Build.0 = Debug|Any CPU287 {B8B9E73B-18DE-4781-8F31-D3472BA9DB66}.Debug|x64.ActiveCfg = Debug|x64288 {B8B9E73B-18DE-4781-8F31-D3472BA9DB66}.Debug|x64.Build.0 = Debug|x64289 {B8B9E73B-18DE-4781-8F31-D3472BA9DB66}.Debug|x86.ActiveCfg = Debug|x86290 {B8B9E73B-18DE-4781-8F31-D3472BA9DB66}.Debug|x86.Build.0 = Debug|x86291 {B8B9E73B-18DE-4781-8F31-D3472BA9DB66}.Release|Any CPU.ActiveCfg = Release|Any CPU292 {B8B9E73B-18DE-4781-8F31-D3472BA9DB66}.Release|Any CPU.Build.0 = Release|Any CPU293 {B8B9E73B-18DE-4781-8F31-D3472BA9DB66}.Release|x64.ActiveCfg = Release|x64294 {B8B9E73B-18DE-4781-8F31-D3472BA9DB66}.Release|x64.Build.0 = Release|x64295 {B8B9E73B-18DE-4781-8F31-D3472BA9DB66}.Release|x86.ActiveCfg = Release|x86296 {B8B9E73B-18DE-4781-8F31-D3472BA9DB66}.Release|x86.Build.0 = Release|x86297 273 {C3F0C7DC-82AD-405B-990A-BF2C5B7F46FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 298 274 {C3F0C7DC-82AD-405B-990A-BF2C5B7F46FF}.Debug|Any CPU.Build.0 = Debug|Any CPU … … 439 415 {C5AE5D30-AE8C-4017-B741-99E084281000}.Release|x86.ActiveCfg = Release|x86 440 416 {C5AE5D30-AE8C-4017-B741-99E084281000}.Release|x86.Build.0 = Release|x86 417 {832EA4F3-20F7-42D7-B079-B588BA559E5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 418 {832EA4F3-20F7-42D7-B079-B588BA559E5F}.Debug|Any CPU.Build.0 = Debug|Any CPU 419 {832EA4F3-20F7-42D7-B079-B588BA559E5F}.Debug|x64.ActiveCfg = Debug|x64 420 {832EA4F3-20F7-42D7-B079-B588BA559E5F}.Debug|x64.Build.0 = Debug|x64 421 {832EA4F3-20F7-42D7-B079-B588BA559E5F}.Debug|x86.ActiveCfg = Debug|x86 422 {832EA4F3-20F7-42D7-B079-B588BA559E5F}.Debug|x86.Build.0 = Debug|x86 423 {832EA4F3-20F7-42D7-B079-B588BA559E5F}.Release|Any CPU.ActiveCfg = Release|Any CPU 424 {832EA4F3-20F7-42D7-B079-B588BA559E5F}.Release|Any CPU.Build.0 = Release|Any CPU 425 {832EA4F3-20F7-42D7-B079-B588BA559E5F}.Release|x64.ActiveCfg = Release|x64 426 {832EA4F3-20F7-42D7-B079-B588BA559E5F}.Release|x64.Build.0 = Release|x64 427 {832EA4F3-20F7-42D7-B079-B588BA559E5F}.Release|x86.ActiveCfg = Release|x86 428 {832EA4F3-20F7-42D7-B079-B588BA559E5F}.Release|x86.Build.0 = Release|x86 429 {675A6EE4-DE7C-413E-8BEF-EB21E0384C87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 430 {675A6EE4-DE7C-413E-8BEF-EB21E0384C87}.Debug|Any CPU.Build.0 = Debug|Any CPU 431 {675A6EE4-DE7C-413E-8BEF-EB21E0384C87}.Debug|x64.ActiveCfg = Debug|x64 432 {675A6EE4-DE7C-413E-8BEF-EB21E0384C87}.Debug|x64.Build.0 = Debug|x64 433 {675A6EE4-DE7C-413E-8BEF-EB21E0384C87}.Debug|x86.ActiveCfg = Debug|x86 434 {675A6EE4-DE7C-413E-8BEF-EB21E0384C87}.Debug|x86.Build.0 = Debug|x86 435 {675A6EE4-DE7C-413E-8BEF-EB21E0384C87}.Release|Any CPU.ActiveCfg = Release|Any CPU 436 {675A6EE4-DE7C-413E-8BEF-EB21E0384C87}.Release|Any CPU.Build.0 = Release|Any CPU 437 {675A6EE4-DE7C-413E-8BEF-EB21E0384C87}.Release|x64.ActiveCfg = Release|x64 438 {675A6EE4-DE7C-413E-8BEF-EB21E0384C87}.Release|x64.Build.0 = Release|x64 439 {675A6EE4-DE7C-413E-8BEF-EB21E0384C87}.Release|x86.ActiveCfg = Release|x86 440 {675A6EE4-DE7C-413E-8BEF-EB21E0384C87}.Release|x86.Build.0 = Release|x86 441 441 EndGlobalSection 442 442 GlobalSection(SolutionProperties) = preSolution -
stable/HeuristicLab.ExtLibs/HeuristicLab.EPPlus/4.0.3/EPPlus-4.0.3
-
Property
svn:ignore
set to
obj
bin
-
Property
svn:ignore
set to
-
stable/HeuristicLab.ExtLibs/HeuristicLab.EPPlus/4.0.3/EPPlus-4.0.3/EPPlus-4.0.3.csproj
r12074 r12707 49 49 <DebugType>full</DebugType> 50 50 <Optimize>false</Optimize> 51 <OutputPath> ..\..\..\..\bin\</OutputPath>51 <OutputPath>bin\Debug\</OutputPath> 52 52 <DefineConstants>DEBUG;TRACE</DefineConstants> 53 53 <ErrorReport>prompt</ErrorReport> … … 64 64 <DebugType>pdbonly</DebugType> 65 65 <Optimize>true</Optimize> 66 <OutputPath> ..\..\..\..\bin\</OutputPath>66 <OutputPath>bin\Release\</OutputPath> 67 67 <DefineConstants>TRACE</DefineConstants> 68 68 <ErrorReport>prompt</ErrorReport> … … 73 73 <PlatformTarget>AnyCPU</PlatformTarget> 74 74 <Prefer32Bit>false</Prefer32Bit> 75 </PropertyGroup> 76 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> 77 <DebugSymbols>true</DebugSymbols> 78 <OutputPath>bin\x86\Debug\</OutputPath> 79 <DefineConstants>DEBUG;TRACE</DefineConstants> 80 <DebugType>full</DebugType> 81 <PlatformTarget>x86</PlatformTarget> 82 <ErrorReport>prompt</ErrorReport> 83 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 84 </PropertyGroup> 85 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"> 86 <OutputPath>bin\x86\Release\</OutputPath> 87 <DefineConstants>TRACE</DefineConstants> 88 <Optimize>true</Optimize> 89 <DebugType>pdbonly</DebugType> 90 <PlatformTarget>x86</PlatformTarget> 91 <ErrorReport>prompt</ErrorReport> 92 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 93 </PropertyGroup> 94 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> 95 <DebugSymbols>true</DebugSymbols> 96 <OutputPath>bin\x64\Debug\</OutputPath> 97 <DefineConstants>DEBUG;TRACE</DefineConstants> 98 <DebugType>full</DebugType> 99 <PlatformTarget>x64</PlatformTarget> 100 <ErrorReport>prompt</ErrorReport> 101 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 102 </PropertyGroup> 103 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> 104 <OutputPath>bin\x64\Release\</OutputPath> 105 <DefineConstants>TRACE</DefineConstants> 106 <Optimize>true</Optimize> 107 <DebugType>pdbonly</DebugType> 108 <PlatformTarget>x64</PlatformTarget> 109 <ErrorReport>prompt</ErrorReport> 110 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 75 111 </PropertyGroup> 76 112 <ItemGroup> -
stable/HeuristicLab.ExtLibs/HeuristicLab.EPPlus/4.0.3/EPPlus-4.0.3/ExcelCellBase.cs
r12074 r12707 481 481 return GetRowCol(address, out row, out col, throwException, out fixedRow, out fixedCol); 482 482 } 483 internal static bool GetRowCol(string address, out int row, out int col, bool throwException, out bool fixedRow, out bool fixedCol) 484 { 483 internal static bool GetRowCol(string address, out int row, out int col, bool throwException, out bool fixedRow, out bool fixedCol) { 485 484 bool colPart = true; 486 string sRow = "", sCol = ""; 485 int colStartIx = 0; 486 int colLength = 0; 487 487 col = 0; 488 row = 0; 488 489 fixedRow = false; 489 490 fixedCol = false; 490 if (address.IndexOf(':') > 0) //If it is a mult-cell address use 491 { 492 address = address.Substring(0, address.IndexOf(':')); 493 } 491 494 492 if (address.EndsWith("#REF!")) 495 493 { … … 502 500 if (sheetMarkerIndex >= 0) 503 501 { 504 address = address.Substring(sheetMarkerIndex + 1); 505 } 506 507 address = address.ToUpper(CultureInfo.InvariantCulture); 508 for (int i = 0; i < address.Length; i++) 509 { 510 if ((address[i] >= 'A' && address[i] <= 'Z') && colPart && sCol.Length <= 3) 511 { 512 sCol += address[i]; 513 } 514 else if (address[i] >= '0' && address[i] <= '9') 515 { 516 sRow += address[i]; 502 colStartIx = sheetMarkerIndex + 1; 503 } 504 505 for (int i = colStartIx; i < address.Length; i++) 506 { 507 char c = address[i]; 508 if (colPart && ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z')) && colLength <= 3) 509 { 510 col *= 26; 511 col += ((int)c) - 64; 512 colLength++; 513 } 514 else if (c >= '0' && c <= '9') 515 { 516 row *= 10; 517 row += ((int)c) - 48; 517 518 colPart = false; 518 519 } 519 else if (address[i] == '$') 520 { 521 if (i == 0) 522 fixedCol = true; 523 else 520 else if (c == '$') 521 { 522 if (i == colStartIx) 523 { 524 colStartIx++; 525 fixedCol = true; 526 } 527 else 528 { 529 colPart = false; 524 530 fixedRow = true; 525 } 526 else 527 { 531 } 532 } 533 else if (c == ':') 534 { 535 break; 536 } 537 else 538 { 539 row = 0; 540 col = 0; 528 541 if (throwException) 529 542 { … … 532 545 else 533 546 { 534 row = 0;535 col = 0;536 547 return false; 537 548 } 538 549 } 539 550 } 540 541 // Get the column number 542 if (sCol != "") 543 { 544 col = GetColumn(sCol); 545 } 546 else 547 { 548 col = 0; 549 int.TryParse(sRow, out row); 550 return row>0; 551 } 552 // Get the row number 553 if (sRow == "") //Blank, fullRow 554 { 555 //if (throwException) 556 //{ 557 // throw (new Exception(string.Format("Invalid Address format {0}", address))); 558 //} 559 //else 560 //{ 561 row = 0; 562 return col > 0; 563 //} 564 } 565 else 566 { 567 return int.TryParse(sRow, out row); 568 } 551 return row != 0 || col != 0; 569 552 } 570 553 -
stable/HeuristicLab.ExtLibs/HeuristicLab.EPPlus/4.0.3/EPPlus-4.0.3/ExcelRangeBase.cs
r12074 r12707 59 59 /// A range of cells 60 60 /// </summary> 61 public class ExcelRangeBase : ExcelAddress, IExcelCell, I Disposable, IEnumerable<ExcelRangeBase>, IEnumerator<ExcelRangeBase>61 public class ExcelRangeBase : ExcelAddress, IExcelCell, IEnumerable<ExcelRangeBase> 62 62 { 63 63 /// <summary> … … 2758 2758 public IEnumerator<ExcelRangeBase> GetEnumerator() 2759 2759 { 2760 Reset(); 2761 return this; 2760 return new ExcelRangeBaseEnumerator(this); 2762 2761 } 2763 2762 2764 2763 IEnumerator IEnumerable.GetEnumerator() 2765 2764 { 2766 Reset(); 2767 return this; 2765 return new ExcelRangeBaseEnumerator(this); 2768 2766 } 2769 2767 … … 2771 2769 /// The current range when enumerating 2772 2770 /// </summary> 2773 public ExcelRangeBase Current 2774 { 2775 get 2776 { 2777 return new ExcelRangeBase(_worksheet, ExcelAddressBase.GetAddress(cellEnum.Row, cellEnum.Column)); 2778 } 2779 } 2780 2781 /// <summary> 2782 /// The current range when enumerating 2783 /// </summary> 2784 object IEnumerator.Current 2785 { 2786 get 2787 { 2788 return ((object)(new ExcelRangeBase(_worksheet, ExcelAddressBase.GetAddress(cellEnum.Row, cellEnum.Column)))); 2789 } 2790 } 2791 2792 int _enumAddressIx = -1; 2793 public bool MoveNext() 2794 { 2795 if (cellEnum.Next()) 2796 { 2797 return true; 2771 public class ExcelRangeBaseEnumerator : IEnumerator<ExcelRangeBase> { 2772 private CellsStoreEnumerator<object> _cellEnum; 2773 private int _enumAddressIx = -1; 2774 private ExcelRangeBase _range; 2775 private ExcelRangeBase _current; 2776 2777 /// <summary> 2778 /// The current range when enumerating 2779 /// </summary> 2780 public ExcelRangeBase Current { 2781 get { 2782 return _current; 2783 } 2798 2784 } 2799 else if (_addresses!=null) 2800 { 2801 _enumAddressIx++; 2802 if (_enumAddressIx < _addresses.Count) 2803 { 2804 cellEnum = new CellsStoreEnumerator<object>(_worksheet._values, 2805 _addresses[_enumAddressIx]._fromRow, 2806 _addresses[_enumAddressIx]._fromCol, 2807 _addresses[_enumAddressIx]._toRow, 2808 _addresses[_enumAddressIx]._toCol); 2809 return MoveNext(); 2810 } 2811 else 2812 { 2813 return false; 2785 2786 /// <summary> 2787 /// The current range when enumerating 2788 /// </summary> 2789 object IEnumerator.Current { 2790 get { 2791 return _current; 2814 2792 } 2815 2793 } 2816 return false; 2817 } 2818 2819 public void Reset() 2820 { 2821 _enumAddressIx = -1; 2822 cellEnum = new CellsStoreEnumerator<object>(_worksheet._values, _fromRow, _fromCol, _toRow, _toCol); 2794 2795 public ExcelRangeBaseEnumerator(ExcelRangeBase range) { 2796 this._range = range; 2797 Reset(); 2798 } 2799 public bool MoveNext() { 2800 if (_cellEnum.Next()) { 2801 _current._fromCol = _cellEnum.Column; 2802 _current._fromRow = _cellEnum.Row; 2803 _current._toCol = _cellEnum.Column; 2804 _current._toRow = _cellEnum.Row; 2805 _current.Address = GetAddress(_current._fromRow, _current._fromCol); 2806 return true; 2807 } 2808 else if (_range._addresses != null) { 2809 _enumAddressIx++; 2810 if (_enumAddressIx < _range._addresses.Count) { 2811 _cellEnum = new CellsStoreEnumerator<object>(_range._worksheet._values, 2812 _range._addresses[_enumAddressIx]._fromRow, 2813 _range._addresses[_enumAddressIx]._fromCol, 2814 _range._addresses[_enumAddressIx]._toRow, 2815 _range._addresses[_enumAddressIx]._toCol); 2816 return MoveNext(); 2817 } 2818 else { 2819 return false; 2820 } 2821 } 2822 return false; 2823 } 2824 2825 public void Reset() { 2826 _enumAddressIx = -1; 2827 _cellEnum = new CellsStoreEnumerator<object>(_range._worksheet._values, _range._fromRow, _range._fromCol, _range._toRow, _range._toCol); 2828 _current = new ExcelRangeBase(_range._worksheet, ExcelAddressBase.GetAddress(_cellEnum.Row, _cellEnum.Column)); 2829 } 2830 2831 public void Dispose() { 2832 if (_cellEnum != null) { 2833 _cellEnum.Dispose(); 2834 _cellEnum = null; 2835 } 2836 } 2837 2823 2838 } 2824 2839 -
stable/HeuristicLab.ExtLibs/HeuristicLab.EPPlus/4.0.3/EPPlus-4.0.3/Table/PivotTable/ExcelPivotTable.cs
r12074 r12707 151 151 LoadFields(); 152 152 153 using (var r=sheet.Cells[address.Address]) 154 { 155 r.Clear(); 156 } 153 sheet.Cells[address.Address].Clear(); 157 154 } 158 155 private void init() -
stable/HeuristicLab.ExtLibs/HeuristicLab.EPPlus/4.0.3/HeuristicLab.EPPlus-4.0.3
-
Property
svn:ignore
set to
obj
Plugin.cs
*.user
-
Property
svn:ignore
set to
-
stable/HeuristicLab.ExtLibs/HeuristicLab.EPPlus/4.0.3/HeuristicLab.EPPlus-4.0.3/HeuristicLab.EPPlus-4.0.3.csproj
r12074 r12707 88 88 </ItemGroup> 89 89 <ItemGroup> 90 <None Include="epplus-4.0.3 memory improvement.diff" /> 90 91 <None Include="Plugin.cs.frame" /> 91 92 <Compile Include="Plugin.cs" /> -
stable/HeuristicLab.ExtLibs/HeuristicLab.EPPlus/4.0.3/HeuristicLab.EPPlus-4.0.3/Properties
-
Property
svn:ignore
set to
AssemblyInfo.cs
-
Property
svn:ignore
set to
-
stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views merged: 12089-12090
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views-3.4.csproj
r11923 r12707 99 99 </PropertyGroup> 100 100 <ItemGroup> 101 <Reference Include="EPPlus-3.1.3, Version=3.1.3.0, Culture=neutral, PublicKeyToken=ea159fdaa78159a1, processorArchitecture=MSIL"> 102 <SpecificVersion>False</SpecificVersion> 103 <HintPath>..\..\bin\EPPlus-3.1.3.dll</HintPath> 101 <Reference Include="EPPlus-4.0.3, Version=4.0.3.0, Culture=neutral, PublicKeyToken=ea159fdaa78159a1, processorArchitecture=MSIL"> 104 102 <Private>False</Private> 105 103 </Reference> -
stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/Plugin.cs.frame
r12009 r12707 34 34 [PluginDependency("HeuristicLab.Data", "3.3")] 35 35 [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")] 36 [PluginDependency("HeuristicLab.EPPlus", " 3.1")]36 [PluginDependency("HeuristicLab.EPPlus", "4.0.1")] 37 37 [PluginDependency("HeuristicLab.MainForm", "3.3")] 38 38 [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")] -
stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views merged: 12089-12090
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj
r11920 r12707 103 103 <Private>False</Private> 104 104 </Reference> 105 <Reference Include="EPPlus-3.1.3, Version=3.1.3.0, Culture=neutral, PublicKeyToken=ea159fdaa78159a1, processorArchitecture=MSIL"> 106 <SpecificVersion>False</SpecificVersion> 107 <HintPath>..\..\bin\EPPlus-3.1.3.dll</HintPath> 105 <Reference Include="EPPlus-4.0.3, Version=4.0.3.0, Culture=neutral, PublicKeyToken=ea159fdaa78159a1, processorArchitecture=MSIL"> 108 106 <Private>False</Private> 109 107 </Reference> -
stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Plugin.cs.frame
r12009 r12707 37 37 [PluginDependency("HeuristicLab.Data", "3.3")] 38 38 [PluginDependency("HeuristicLab.Data.Views", "3.3")] 39 [PluginDependency("HeuristicLab.EPPlus", " 3.1")]39 [PluginDependency("HeuristicLab.EPPlus", "4.0.3")] 40 40 [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")] 41 41 [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views", "3.4")]
Note: See TracChangeset
for help on using the changeset viewer.