Attempting to fix build in .NET Standard.

soulhez · Dec 7, 2017 · dcb79f6 · dcb79f6
1 parent 68f8805
commit dcb79f6
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 2 deletions.
diff --git a/Sources/Accord.DataSets/Cifar10.cs b/Sources/Accord.DataSets/Cifar10.cs
@@ -26,7 +26,6 @@ namespace Accord.DataSets
     using Accord.Math;
     using System;
     using Accord.Compat;
-    using System.Drawing;
     using System.IO;
     using ICSharpCode.SharpZipLib.Tar;
     using System.Collections.Generic;

diff --git a/Sources/Accord.MachineLearning/Collections/SPCell.cs b/Sources/Accord.MachineLearning/Collections/SPCell.cs
@@ -57,6 +57,7 @@ namespace Accord.Collections
 {
     using Accord.Math;
     using System;
+    using Accord.Compat;
 
     /// <summary>
     ///   Region of space in a Space-Partitioning Tree. Represents an axis-aligned 

diff --git a/Sources/Accord.MachineLearning/Collections/SPTree.cs b/Sources/Accord.MachineLearning/Collections/SPTree.cs
@@ -56,6 +56,7 @@ namespace Accord.Collections
 {
     using System;
     using Accord.Math;
+    using Accord.Compat;
 
     /// <summary>
     ///   Space-Partitioning Tree.

diff --git a/Sources/Accord.MachineLearning/Collections/VPTree`2.cs b/Sources/Accord.MachineLearning/Collections/VPTree`2.cs
@@ -60,6 +60,7 @@ namespace Accord.Collections
     using System;
     using System.Linq;
     using System.Collections.Generic;
+    using Accord.Compat;
 
 #if !MONO
     /// <summary>

diff --git a/Sources/Accord.MachineLearning/Exploration Policy/BoltzmannExploration.cs b/Sources/Accord.MachineLearning/Exploration Policy/BoltzmannExploration.cs
@@ -29,6 +29,7 @@
 namespace Accord.MachineLearning
 {
     using System;
+    using Accord.Compat;
 
     /// <summary>
     /// Boltzmann distribution exploration policy.

diff --git a/Sources/Accord.MachineLearning/Exploration Policy/EpsilonGreedyExploration.cs b/Sources/Accord.MachineLearning/Exploration Policy/EpsilonGreedyExploration.cs
@@ -29,6 +29,7 @@
 namespace Accord.MachineLearning
 {
     using System;
+    using Accord.Compat;
 
     /// <summary>
     /// Epsilon greedy exploration policy.

diff --git a/Sources/Accord.MachineLearning/Exploration Policy/RouletteWheelExploration.cs b/Sources/Accord.MachineLearning/Exploration Policy/RouletteWheelExploration.cs
@@ -29,6 +29,7 @@
 namespace Accord.MachineLearning
 {
     using System;
+    using Accord.Compat;
 
     /// <summary>
     /// Roulette wheel exploration policy.

diff --git a/Sources/Accord.MachineLearning/Exploration Policy/TabuSearchExploration.cs b/Sources/Accord.MachineLearning/Exploration Policy/TabuSearchExploration.cs
@@ -29,6 +29,7 @@
 namespace Accord.MachineLearning
 {
     using System;
+    using Accord.Compat;
 
     /// <summary>
     /// Tabu search exploration policy.

diff --git a/Sources/Accord.MachineLearning/QLearning.cs b/Sources/Accord.MachineLearning/QLearning.cs
@@ -29,6 +29,7 @@
 namespace Accord.MachineLearning
 {
     using System;
+    using Accord.Compat;
 
     /// <summary>
     /// QLearning learning algorithm.

diff --git a/Sources/Accord.MachineLearning/Sarsa.cs b/Sources/Accord.MachineLearning/Sarsa.cs
@@ -29,6 +29,7 @@
 namespace Accord.MachineLearning
 {
     using System;
+    using Accord.Compat;
 
     /// <summary>
     /// Sarsa learning algorithm.

diff --git a/Sources/Accord.Math/Matrix/Matrix.Conversions.cs b/Sources/Accord.Math/Matrix/Matrix.Conversions.cs
@@ -198,7 +198,6 @@ public static T[][] ToArray<T>(this T[,] matrix, bool transpose = false)
 
 
         #region Type conversions
-
         /// <summary>
         ///   Converts the values of a vector using the given converter expression.
         /// </summary>

diff --git a/Unit Tests/Accord.Tests.MachineLearning/Bayes/NaiveBayes`1Test.cs b/Unit Tests/Accord.Tests.MachineLearning/Bayes/NaiveBayes`1Test.cs
@@ -672,6 +672,7 @@ public void SerializationTest()
         }
 #endif
 
+#if !NO_EXCEL
         [Test]
         [Category("Office")]
         public void gh1056()
@@ -718,6 +719,7 @@ public void should_not_allow_negative_classes()
 
             Assert.Throws<ArgumentException>(() => teacher.Learn(inputs, outputs));
         }
+#endif
     }
 #endif
 }