diff --git a/Analyser/Dynamic/ConfidenceCounter.cpp b/Analyser/Dynamic/ConfidenceCounter.cpp
index 2a7ebfae9..8a39a474c 100644
--- a/Analyser/Dynamic/ConfidenceCounter.cpp
+++ b/Analyser/Dynamic/ConfidenceCounter.cpp
@@ -10,7 +10,7 @@
using namespace DynamicAnalyser;
-float ConfidenceCounter::get_probability() {
+float ConfidenceCounter::get_confidence() {
return static_cast<float>(hits_) / static_cast<float>(hits_ + misses_);
}
diff --git a/Analyser/Dynamic/ConfidenceCounter.hpp b/Analyser/Dynamic/ConfidenceCounter.hpp
index 68f8ef91e..ed1be56d4 100644
--- a/Analyser/Dynamic/ConfidenceCounter.hpp
+++ b/Analyser/Dynamic/ConfidenceCounter.hpp
@@ -21,7 +21,7 @@ namespace DynamicAnalyser {
class ConfidenceCounter: public ConfidenceSource {
public:
/*! @returns The computed probability, based on the history of events. */
- float get_probability() override;
+ float get_confidence() override;
/*! Records an event that implies this is the appropriate class — pushes probability up towards 1.0. */
void add_hit();
diff --git a/Analyser/Dynamic/ConfidenceSource.hpp b/Analyser/Dynamic/ConfidenceSource.hpp
index 0f959f9d1..2754a8fdb 100644
--- a/Analyser/Dynamic/ConfidenceSource.hpp
+++ b/Analyser/Dynamic/ConfidenceSource.hpp
@@ -18,7 +18,7 @@ namespace DynamicAnalyser {
program is handed to an Atari 2600 then its confidence should grow towards 1.0.
*/
struct ConfidenceSource {
- virtual float get_probability() = 0;
+ virtual float get_confidence() = 0;
};
}
diff --git a/Analyser/Dynamic/ConfidenceSummary.cpp b/Analyser/Dynamic/ConfidenceSummary.cpp
index f2888a4d8..4306fba13 100644
--- a/Analyser/Dynamic/ConfidenceSummary.cpp
+++ b/Analyser/Dynamic/ConfidenceSummary.cpp
@@ -19,10 +19,10 @@ ConfidenceSummary::ConfidenceSummary(const std::vector<ConfidenceSource *> &sour
weight_sum_ = std::accumulate(weights.begin(), weights.end(), 0.0f);
}
-float ConfidenceSummary::get_probability() {
+float ConfidenceSummary::get_confidence() {
float result = 0.0f;
for(std::size_t index = 0; index < sources_.size(); ++index) {
- result += sources_[index]->get_probability() * weights_[index];
+ result += sources_[index]->get_confidence() * weights_[index];
}
return result / weight_sum_;
}
diff --git a/Analyser/Dynamic/ConfidenceSummary.hpp b/Analyser/Dynamic/ConfidenceSummary.hpp
index a3f8f2fb7..cb8cdac55 100644
--- a/Analyser/Dynamic/ConfidenceSummary.hpp
+++ b/Analyser/Dynamic/ConfidenceSummary.hpp
@@ -31,7 +31,7 @@ class ConfidenceSummary: public ConfidenceSource {
const std::vector<float> &weights);
/*! @returns The weighted sum of all sources. */
- float get_probability() override;
+ float get_confidence() override;
private:
std::vector<ConfidenceSource *> sources_;
diff --git a/Analyser/Static/Acorn/StaticAnalyser.cpp b/Analyser/Static/Acorn/StaticAnalyser.cpp
index a251ef8c9..cff55c8a1 100644
--- a/Analyser/Static/Acorn/StaticAnalyser.cpp
+++ b/Analyser/Static/Acorn/StaticAnalyser.cpp
@@ -59,7 +59,7 @@ static std::vector<std::shared_ptr<Storage::Cartridge::Cartridge>>
void Analyser::Static::Acorn::AddTargets(const Media &media, std::vector<std::unique_ptr<Target>> &destination) {
std::unique_ptr<Target> target(new Target);
target->machine = Machine::Electron;
- target->probability = 1.0; // TODO: a proper estimation
+ target->confidence = 1.0; // TODO: a proper estimation
target->acorn.has_dfs = false;
target->acorn.has_adfs = false;
target->acorn.should_shift_restart = false;
diff --git a/Analyser/Static/AmstradCPC/StaticAnalyser.cpp b/Analyser/Static/AmstradCPC/StaticAnalyser.cpp
index 04bae8d70..e048af1c4 100644
--- a/Analyser/Static/AmstradCPC/StaticAnalyser.cpp
+++ b/Analyser/Static/AmstradCPC/StaticAnalyser.cpp
@@ -180,7 +180,7 @@ static bool CheckBootSector(const std::shared_ptr<Storage::Disk::Disk> &disk, co
void Analyser::Static::AmstradCPC::AddTargets(const Media &media, std::vector<std::unique_ptr<Target>> &destination) {
std::unique_ptr<Target> target(new Target);
target->machine = Machine::AmstradCPC;
- target->probability = 1.0;
+ target->confidence = 1.0;
target->media.disks = media.disks;
target->media.tapes = media.tapes;
target->media.cartridges = media.cartridges;
diff --git a/Analyser/Static/Atari/StaticAnalyser.cpp b/Analyser/Static/Atari/StaticAnalyser.cpp
index b687c0ada..e3691e30a 100644
--- a/Analyser/Static/Atari/StaticAnalyser.cpp
+++ b/Analyser/Static/Atari/StaticAnalyser.cpp
@@ -182,7 +182,7 @@ void Analyser::Static::Atari::AddTargets(const Media &media, std::vector<std::un
// TODO: sanity checking; is this image really for an Atari 2600.
std::unique_ptr<Target> target(new Target);
target->machine = Machine::Atari2600;
- target->probability = 1.0;
+ target->confidence = 1.0;
target->media.cartridges = media.cartridges;
target->atari.paging_model = Atari2600PagingModel::None;
target->atari.uses_superchip = false;
diff --git a/Analyser/Static/Commodore/StaticAnalyser.cpp b/Analyser/Static/Commodore/StaticAnalyser.cpp
index 09aaf15fd..055404f9d 100644
--- a/Analyser/Static/Commodore/StaticAnalyser.cpp
+++ b/Analyser/Static/Commodore/StaticAnalyser.cpp
@@ -41,7 +41,7 @@ static std::vector<std::shared_ptr<Storage::Cartridge::Cartridge>>
void Analyser::Static::Commodore::AddTargets(const Media &media, std::vector<std::unique_ptr<Target>> &destination) {
std::unique_ptr<Target> target(new Target);
target->machine = Machine::Vic20; // TODO: machine estimation
- target->probability = 1.0; // TODO: a proper estimation
+ target->confidence = 1.0; // TODO: a proper estimation
int device = 0;
std::vector<File> files;
diff --git a/Analyser/Static/MSX/StaticAnalyser.cpp b/Analyser/Static/MSX/StaticAnalyser.cpp
index 1a0ae98b1..78f3d582f 100644
--- a/Analyser/Static/MSX/StaticAnalyser.cpp
+++ b/Analyser/Static/MSX/StaticAnalyser.cpp
@@ -225,7 +225,7 @@ void Analyser::Static::MSX::AddTargets(const Media &media, std::vector<std::uniq
if(!target->media.empty()) {
target->machine = Machine::MSX;
- target->probability = 1.0;
+ target->confidence = 1.0;
destination.push_back(std::move(target));
}
}
diff --git a/Analyser/Static/Oric/StaticAnalyser.cpp b/Analyser/Static/Oric/StaticAnalyser.cpp
index 42101d52d..67c3c867e 100644
--- a/Analyser/Static/Oric/StaticAnalyser.cpp
+++ b/Analyser/Static/Oric/StaticAnalyser.cpp
@@ -76,7 +76,7 @@ static int Basic11Score(const Analyser::Static::MOS6502::Disassembly &disassembl
void Analyser::Static::Oric::AddTargets(const Media &media, std::vector<std::unique_ptr<Target>> &destination) {
std::unique_ptr<Target> target(new Target);
target->machine = Machine::Oric;
- target->probability = 1.0;
+ target->confidence = 1.0;
int basic10_votes = 0;
int basic11_votes = 0;
diff --git a/Analyser/Static/StaticAnalyser.hpp b/Analyser/Static/StaticAnalyser.hpp
index 86d49bd76..7cf4a738d 100644
--- a/Analyser/Static/StaticAnalyser.hpp
+++ b/Analyser/Static/StaticAnalyser.hpp
@@ -84,7 +84,7 @@ struct Target {
Machine machine;
Media media;
- float probability;
+ float confidence;
std::string loading_command;
// TODO: this is too C-like a solution; make Target a base class and
diff --git a/Machines/MSX/ROMSlotHandler.hpp b/Machines/MSX/ROMSlotHandler.hpp
index 6d3c53b0f..5c8f8a533 100644
--- a/Machines/MSX/ROMSlotHandler.hpp
+++ b/Machines/MSX/ROMSlotHandler.hpp
@@ -66,7 +66,7 @@ class ROMSlotHandler {
/*! @returns The probability that this handler is correct for the data it owns. */
float get_confidence() {
- return confidence_counter_.get_probability();
+ return confidence_counter_.get_confidence();
}
protected: