final changes

nicehash · Feb 5, 2017 · b3ffd5d · b3ffd5d
1 parent 9bdb346
commit b3ffd5d
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/NiceHashMiner/Algorithm.cs b/NiceHashMiner/Algorithm.cs
@@ -25,7 +25,7 @@ public class Algorithm {
         public double AvaragedSpeed { get; set; }
         // based on device and settings here we set the miner path
         public string MinerBinaryPath = "";
-        // TODO these are changing (logging reasons)
+        // these are changing (logging reasons)
         public double CurrentProfit = 0;
         public double CurNhmSMADataVal = 0;
 

diff --git a/NiceHashMiner/Configs/Data/AlgorithmConfig.cs b/NiceHashMiner/Configs/Data/AlgorithmConfig.cs
@@ -9,7 +9,7 @@ public class AlgorithmConfig {
         public string Name = ""; // Used as an indicator for easier user interaction
         public AlgorithmType NiceHashID = AlgorithmType.NONE;
         public MinerBaseType MinerBaseType = MinerBaseType.NONE;
-        public string MinerName = "";  // TODO probably not needed
+        public string MinerName = "";  // probably not needed
         public double BenchmarkSpeed = 0;
         public string ExtraLaunchParameters= "";
         public bool Enabled = true;

diff --git a/NiceHashMiner/Devices/ComputeDevice.cs b/NiceHashMiner/Devices/ComputeDevice.cs
@@ -185,6 +185,7 @@ public DeviceBenchmarkConfig GetAlgorithmDeviceConfig() {
             foreach (var algo in this.AlgorithmSettings) {
                 // create/setup
                 AlgorithmConfig conf = new AlgorithmConfig();
+                conf.Name = algo.AlgorithmStringID;
                 conf.NiceHashID = algo.NiceHashID;
                 conf.MinerBaseType = algo.MinerBaseType;
                 conf.MinerName = algo.MinerName; // TODO probably not needed

diff --git a/NiceHashMiner/Devices/GroupAlgorithms.cs b/NiceHashMiner/Devices/GroupAlgorithms.cs
@@ -177,6 +177,7 @@ public static Dictionary<MinerBaseType, List<Algorithm>> CreateDefaultsForGroup(
             // NVIDIA
             if (DeviceGroupType.NVIDIA_2_1 == deviceGroupType || DeviceGroupType.NVIDIA_3_x == deviceGroupType || DeviceGroupType.NVIDIA_5_x == deviceGroupType || DeviceGroupType.NVIDIA_6_x == deviceGroupType) {
                 var ToRemoveAlgoTypes = new List<AlgorithmType>();
+                var ToRemoveMinerTypes = new List<MinerBaseType>();
                 var ret = new Dictionary<MinerBaseType, List<Algorithm>>() {
                     { MinerBaseType.ccminer,
                         new List<Algorithm>() {
@@ -214,6 +215,7 @@ public static Dictionary<MinerBaseType, List<Algorithm>> CreateDefaultsForGroup(
                         AlgorithmType.Lyra2RE,
                         AlgorithmType.Lyra2REv2
                     });
+                    ToRemoveMinerTypes.Add(MinerBaseType.eqm);
                 }
                 if (DeviceGroupType.NVIDIA_2_1 == deviceGroupType) {
                     ToRemoveAlgoTypes.AddRange(new AlgorithmType[] {
@@ -225,6 +227,7 @@ public static Dictionary<MinerBaseType, List<Algorithm>> CreateDefaultsForGroup(
 
                 // filter unused
                 var finalRet = FilterMinerAlgos(ret, ToRemoveAlgoTypes);
+                finalRet = FilterMinerBaseTypes(finalRet, ToRemoveMinerTypes);
 
                 return finalRet;
             }

diff --git a/NiceHashMiner/Forms/Components/AlgorithmSettingsControl.cs b/NiceHashMiner/Forms/Components/AlgorithmSettingsControl.cs
@@ -72,7 +72,7 @@ public void SetCurrentlySelected(ListViewItem lvi, ComputeDevice computeDevice)
                 this.Enabled = lvi.Checked;
 
                 groupBoxSelectedAlgorithmSettings.Text = String.Format(International.GetText("AlgorithmsListView_GroupBox"),
-                algorithm.AlgorithmName); ;
+                String.Format("{0} ({1})", algorithm.AlgorithmName, algorithm.MinerBaseTypeName)); ;
 
                 field_LessThreads.Enabled = _computeDevice.DeviceGroupType == DeviceGroupType.CPU;
                 if (field_LessThreads.Enabled) {

diff --git a/NiceHashMiner/Miners/Miner.cs b/NiceHashMiner/Miners/Miner.cs
@@ -162,7 +162,6 @@ virtual public void InitMiningSetup(MiningSetup miningSetup) {
             SetAPIPort();
         }
 
-        // TODO remove or don't recheck
         public void InitBenchmarkSetup(MiningPair benchmarkPair) {
             InitMiningSetup(new MiningSetup(new List<MiningPair>() { benchmarkPair }));
             BenchmarkAlgorithm = benchmarkPair.Algorithm;
@@ -570,8 +569,6 @@ protected void StartCoolDownTimerChecker() {
 
 
         virtual protected void Miner_Exited() {
-            // TODO make miner restart in 5 seconds
-            //Stop(MinerStopType.END, true);
             ScheduleRestart(5000);
         }