Context Navigation

Changeset 14106 for trunk

Timestamp:

07/18/16 17:30:13 (8 years ago)

Author:

jkarder

Message:

#2639: fixed compiler warnings

Location:

trunk/sources

Files:

r13651	r14106
392	392	writer.WriteLine("digraph {");
393	393	// writer.WriteLine("rankdir=LR");
394		~~int[] fs;~~
395		~~int nFs;~~
396	394	for (int s = StartState; s < stateNames.Count; s++) {
397	395	for (int i = 0; i < followStates[s].Count; i++) {

-                      r13651
+                      r14106
           case (byte)OpCodes.LoadVar:
+          {
+#pragma warning disable 0675
               short arg = (short)(((short)code[pc] << 8) | (short)code[pc + 1]);
+#pragma warning restore 0675
               pc += 2;
             sb.AppendFormat(" var{0} ", arg); break;

-                      r14016
+                      r14106
       s = 0;
       if (op == (byte)OpCodes.LoadVar) {
+#pragma warning disable 0675
         s = (short)(((short)code[pc] << 8) | (short)code[pc + 1]);
+#pragma warning restore 0675
         pc += 2;
+      }

-                      r13652
+                      r14106
       s = 0;
       if (op == OpCodes.LoadVar) {
+#pragma warning disable 0675
         s = (short)(((short)code[pc] << 8) | (short)code[pc + 1]);
+#pragma warning restore 0675
         pc += 2;
+      }

-                      r12770
+                      r14106
         Parameters.Add(new FixedValueParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)", (BoolValue)new BoolValue(false).AsReadOnly()) { Hidden = true });
+      }
+#pragma warning disable 0618
       if (Parameters.ContainsKey("SimilarityCalculator") && Parameters["SimilarityCalculator"] is IConstrainedValueParameter<ISingleObjectiveSolutionSimilarityCalculator>) {
-#pragma warning disable 0618
         var oldParameter = (IConstrainedValueParameter<ISingleObjectiveSolutionSimilarityCalculator>)Parameters["SimilarityCalculator"];
 #pragma warning restore 0618

-                      r13173
+                      r14106
       // BackwardsCompatibility3.3
       #region Backwards compatible code, remove with 3.4
+#pragma warning disable 0618
       if (Parameters.ContainsKey("SimilarityCalculator") && Parameters["SimilarityCalculator"] is IConstrainedValueParameter<ISingleObjectiveSolutionSimilarityCalculator>) {
-#pragma warning disable 0618
         var oldParameter = (IConstrainedValueParameter<ISingleObjectiveSolutionSimilarityCalculator>)Parameters["SimilarityCalculator"];
 #pragma warning restore 0618

r13514	r14106
537	537	}
538	538
539		pr~~ivat~~e void dataGridView_KeyDown(object sender, KeyEventArgs e) {
	539	protected override void dataGridView_KeyDown(object sender, KeyEventArgs e) {
540	540	var selectedRows = dataGridView.SelectedRows;
541	541	var selectedCells = dataGridView.SelectedCells;

-                      r14000
+                      r14106
+    }
+#pragma warning disable 0067
     public event EventHandler ValueChanged;
+#pragma warning restore 0067
     #endregion

r14000	r14106
85	85	}
86	86
	87	#pragma warning disable 0067
87	88	public event EventHandler ValueChanged;
	89	#pragma warning restore 0067
88	90	#endregion
89	91	}

-                      r13412
+                      r14106
   public sealed class TwoPointFiveMove : Item {
     [Storable]
     public int Index1 { get; protected set; }
+    public int Index1 { get; private set; }
     [Storable]
     public int Index2 { get; protected set; }
+    public int Index2 { get; private set; }
     [Storable]
     public Permutation Permutation { get; protected set; }
+    public Permutation Permutation { get; private set; }
     [Storable]
     public bool IsInvert { get; protected set; }
+    public bool IsInvert { get; private set; }
     [StorableConstructor]

-                      r12012
+                      r14106
   [Item("QAPPopulationDiversityAnalyzer", "An operator for analyzing the diversity of solutions of Quadratic Assignment Problems regarding their structural identity (number of equal facilty->location assignments).")]
   [StorableClass]
+#pragma warning disable 0612
   public sealed class QAPPopulationDiversityAnalyzer : PopulationDiversityAnalyzer<Permutation> {
+#pragma warning restore 0612
     public IValueParameter<BoolValue> UsePhenotypeSimilarityParameter {
       get { return (IValueParameter<BoolValue>)Parameters["UsePhenotypeSimilarity"]; }

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