Context Navigation

← Previous Change
Next Change →

Changeset 12969 for branches/gteufl/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation

Timestamp:

09/25/15 14:39:59 (9 years ago)

Author:

gkronber

Message:

#2478 merged all changes from trunk to branch before trunk-reintegration

Location:

branches/gteufl

Files:

: 13 edited

Legend:

: Unmodified
: Added
: Removed

branches/gteufl

Property svn:ignore

-                      old
+                      new
 FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
+Google.ProtocolBuffers-2.4.1.473.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.ExtLibs.6.0.ReSharper.user
+HeuristicLab.Scripting.Development
 HeuristicLab.resharper.user
 ProtoGen.exe
 …
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab 3.3 Tests
 _ReSharper.HeuristicLab.ExtLibs
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
+obj

Property svn:mergeinfo changed

/branches/1721-RandomForestPersistence (added)	merged: 10321-10322
/branches/CodeEditor (added)	merged: 11700-11701,11707,11722,11738,11741,11743,11765,11785,11800,11802,11804-11805
/branches/DataPreprocessing (added)	merged: 10085,10095,10134,10143-10148,10157-10169,10179-10189,10191-10194,10216-10221,10234-10260,10303-10304,10307-10308,10310-10317,10319-10320,10341-10345,10367,10369-10372,10374,10377,10380-10383,10532-10539,10542,10544,10546-10552,10554-10555,10557-10559,10571-10574,10580-10583,10585-10590,10609-10638,10657-10673,10676,10689-10719,10733-10742,10762-10766,10768-10773,10775-10786,10802-10821,10841-10849,10851-10854,10863,10866-10883,10898-10902,10904-10905,10908-10909,10911,10913-10916,10918,10921-10922,10925,10930-10935,10938-10940,10942-10952,10962,10964-10965,10967,10969-10973,10976-10982,10987,10990-10995,10997-11004,11009,11011,11037-11039,11042-11045,11064,11068,11070,11098
/branches/HLScript (added)	merged: 10331-10332,10358
/branches/HeuristicLab.DatasetRefactor/sources (added)	merged: 11571-11572,11584,11589,11621,11853,12031-12032,12105,12109,12141,12190,12247,12437-12438,12452-12454,12489,12505,12508
/branches/HeuristicLab.Problems.Orienteering (added)	merged: 11130,11132-11134,11136,11185-11195,11226,11228,11235-11237,11240,11242,11245,11247,11258,11260-11261,11264-11270,11275-11277,11284,11289,11293,11299,11301,11303-11305,11307,11311-11312,11314,11316,11319-11323,11325,11327-11329,11413,12694,12721
/branches/HiveStatistics/sources (added)	merged: 12440-12441,12467-12469,12477,12484,12515-12516,12522,12525,12551,12558,12560,12562,12584,12586,12689,12691,12761,12765,12767-12769,12773,12775-12778,12780,12789,12843,12852-12853,12857-12858,12861,12866-12867
/branches/LogResidualEvaluator (added)	merged: 10202-10203,10305,10482-10483
/branches/NSGA-II Changes (added)	merged: 12033-12034,12044
/branches/SpectralKernelForGaussianProcesses (added)	merged: 10204-10205,10473,10479
/stable	merged: 11170,11173,11175,12008-12010,12751-12752
/trunk/sources (added)	merged: 10231,10261,10273,10291-10292,10295,10298,10323-10324,10346,10348,10355,10359-10360,10362-10363,10365-10366,10368,10375,10378,10391,10401,10406-10407,10414,10417-10418,10428,10432-10433,10435,10440,10448,10453,10460,10465-10466,10469-10470,10472,10474-10477,10480,10484,10486,10488-10500,10503-10504,10506,10510-10512,10520-10523,10526,10531,10540-10541,10543,10545,10561-10566,10575-10578,10596-10597,10599,10601-10607,10639,10642-10643,10646,10651-10653,10727,10731,10745,10747,10761,10767,10774,10787-10791,10793-10794,10796,10799-10800,10826,10857-10862,10865,10885,10889,10894-10896,10924,10926-10927,10937,10941,10953,10955-10956,10958-10961,10963,10975,10983-10986,10988-10989,10996,11007-11008,11012-11014,11019,11024-11027,11031,11034-11035,11048,11050-11052,11056-11058,11060,11065-11067,11071,11074-11082,11086-11088,11091-11093,11095-11097,11099,11102,11108,11111-11117,11123-11128,11131,11135,11153,11156,11161,11163,11171-11172,11174,11176,11214,11241,11248-11251,11256,11263,11274,11280,11282-11283,11285-11287,11290,11292,11294-11296,11298,11300,11302,11306,11308-11309,11313,11315,11317,11324,11326,11330-11332,11337-11348,11352-11353,11361-11362,11364-11367,11380-11382,11384,11389,11391-11392,11394,11403-11404,11410-11411,11417-11420,11422,11426-11430,11432,11434-11437,11439-11448,11450,11453,11455-11457,11464,11466-11467,11469-11472,11474,11477-11480,11483,11494-11498,11504,11514-11515,11523-11525,11532-11533,11536,11540-11542,11544-11545,11547-11549,11555,11557,11581,11592,11596-11597,11599-11600,11605,11608,11610,11615-11616,11618,11623,11631,11634,11650-11652,11657,11675,11679-11680,11703-11705,11715,11717,11721,11723-11725,11734-11736,11756-11758,11762-11763,11766,11771-11772,11781-11782,11784,11787-11790,11794,11807,11809-11811,11815-11816,11818-11819,11822,11825-11831,11833-11837,11839-11840,11854,11856,11877-11879,11882,11890,11909,11912-11916,11918,11921,11930,11933-11934,11936,11938-11939,11942,11945,11948,11950-11951,11955-11956,11958-11961,11963,11967,11970-11971,11978,11982-11984,11987-11994,11996,11998-12004,12012,12015-12016,12019,12022,12037,12041,12057,12059-12060,12067,12069-12070,12072,12074,12076-12078,12085,12087-12091,12093,12095-12096,12100-12104,12106-12108,12110-12114,12116-12117,12122-12123,12125-12126,12129,12131,12134-12135,12137,12139-12140,12143-12146,12148,12151-12152,12172-12173,12178-12182,12188-12189,12227,12236-12237,12262,12264,12273,12292-12293,12305,12315,12333,12358-12361,12365,12392-12393,12397-12401,12422,12424,12428-12435,12442-12443,12445,12455-12458,12461,12463-12465,12470-12476,12478-12482,12485,12488,12490-12494,12496-12497,12504,12506-12507,12509,12511-12512,12514,12517-12521,12523-12524,12532,12542,12546,12552-12553,12556-12557,12559,12561,12577-12581,12583,12599,12602,12604,12606,12612-12618,12621-12622,12626-12627,12629-12631,12634,12638,12640-12642,12644-12646,12649-12650,12653-12654,12657,12659,12664,12666,12670-12676,12679-12680,12682-12684,12687-12688,12690,12692,12695,12700-12701,12710,12714-12716,12720,12722,12724,12728,12731,12743-12744,12753,12755,12770,12772,12787,12790-12795,12797-12798,12801,12810-12812,12816-12817,12819,12835-12837,12839,12844-12846,12851,12855,12868,12873,12875,12878-12879,12883,12885-12886,12889,12895-12907,12911-12918,12920-12921,12925-12927,12932,12934,12936-12938,12940,12946-12948,12954,12959-12961

Property svn:global-ignores set to
*.nuget
packages

branches/gteufl/HeuristicLab.Problems.VehicleRouting

Property svn:mergeinfo changed

/branches/DataPreprocessing/HeuristicLab.Problems.VehicleRouting (added)	merged: 10538,11009
/branches/HLScript/HeuristicLab.Problems.VehicleRouting (added)	merged: 10358
/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.VehicleRouting (added)	merged: 12031,12105,12505
/branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.VehicleRouting (added)	merged: 11185,11289,11303,12694
/branches/LogResidualEvaluator/HeuristicLab.Problems.VehicleRouting (added)	merged: 10483
/branches/SpectralKernelForGaussianProcesses/HeuristicLab.Problems.VehicleRouting (added)	merged: 10479
/stable/HeuristicLab.Problems.VehicleRouting	merged: 11170,11173,12008-12009,12751
/trunk/sources/HeuristicLab.Problems.VehicleRouting (added)	merged: 10295,10298,10346,10348,10359-10360,10362-10363,10435,10460,10472,10474-10475,10480,10484,10504,10651,10858,10860,10924,10926,10959,11114,11171,11174,11285,11300,11302,11428,11623,11961,11970,12012,12069-12070,12087,12102,12488,12504,12524,12722,12753

branches/gteufl/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/IPotvinCustomerRelocationMoveOperator.cs

r9456	r12969
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationExhaustiveMoveGenerator.cs

r9456	r12969
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMove.cs

r9456	r12969
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMoveAttribute.cs

r9456	r12969
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMoveEvaluator.cs

r9456	r12969
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMoveGenerator.cs

-                      r9456
+                      r12969
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
     protected abstract PotvinCustomerRelocationMove[] GenerateMoves(PotvinEncoding individual, IVRPProblemInstance problemInstance);
     public override IOperation Apply() {
       IOperation next = base.Apply();
+    public override IOperation InstrumentedApply() {
+      IOperation next = base.InstrumentedApply();
       PotvinEncoding individual = VRPToursParameter.ActualValue as PotvinEncoding;

branches/gteufl/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMoveMaker.cs

r9456	r12969
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMoveTabuCriterion.cs

-                      r9456
+                      r12969
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 #endregion
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 …
       PotvinCustomerRelocationMove move = CustomerRelocationMoveParameter.ActualValue;
+      foreach (IItem tabuMove in tabuList) {
+        PotvinCustomerRelocationMoveAttribute attribute = tabuMove as PotvinCustomerRelocationMoveAttribute;
+      foreach (var attribute in tabuList.OfType<PotvinCustomerRelocationMoveAttribute>()) {
         if (!useAspiration || moveQuality >= attribute.MoveQuality) {
           if (attribute.City == move.City && attribute.Tour == move.Tour) {

branches/gteufl/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMoveTabuMaker.cs

r9456	r12969
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMultiMoveGenerator.cs

r9456	r12969
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/gteufl/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationSingleMoveGenerator.cs

r9456	r12969
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats:

Update cookies preferences