falsycat/blocky
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

revert improvement of aprob calculation

Browse Source
This commit is contained in:
falsycat 2023-01-15 15:35:39 +09:00
parent 9a115f9990
commit af394452c0
1 changed files with 4 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
conv/aprob_fprob.cc
View File

@ -24,7 +24,7 @@ ValueFlag<std::string> fmap {
}; };
ValueFlag<size_t> negative_sample { ValueFlag<size_t> negative_sample {
parser, "samples", "number of samples used to calculate negative factor", {"negative-sample"}, 16, parser, "samples", "number of samples used to calculate negative factor (deprecated and no effect)", {"negative-sample"}, 16,
}; };
} // namespace param } // namespace param
@ -39,42 +39,15 @@ static void Exec() {
const auto fmap = ReadTensor3<uint32_t>(fmap_st); const auto fmap = ReadTensor3<uint32_t>(fmap_st);
Enforce(fmap.size() > 0 && fmap[0].size() > 0, "empty fmap"); Enforce(fmap.size() > 0 && fmap[0].size() > 0, "empty fmap");
std::unordered_set<uint32_t> used_blocks_map;
for (auto& fmap_t : fmap) {
Enforce(fmap_t.size() == fmap[0].size(), "fmap is broken");
for (auto& fmap_f : fmap_t) {
std::copy(fmap_f.begin(), fmap_f.end(), std::inserter(used_blocks_map, used_blocks_map.end()));
}
}
std::vector<uint32_t> used_blocks;
used_blocks.reserve(used_blocks_map.size());
std::copy(used_blocks_map.begin(), used_blocks_map.end(), std::back_inserter(used_blocks));
std::cerr << "deb: " << used_blocks.size() << std::endl;
std::vector<double> negatives; std::vector<double> negatives;
for (size_t t = 0; t < aprobs.size(); ++t) { for (size_t t = 0; t < aprobs.size(); ++t) {
const auto tidx = t % fmap.size(); const auto tidx = t % fmap.size();
for (size_t c = 0; c < fmap[tidx].size(); ++c) { for (size_t c = 0; c < fmap[tidx].size(); ++c) {
const auto& blocks = fmap[tidx][c]; const auto& blocks = fmap[tidx][c];
const auto negative_sample = std::min(
args::get(param::negative_sample),
aprobs[t].size() - blocks.size());
negatives.reserve(negative_sample+1);
negatives.clear();
double positive = 0; double positive = 0;
for (const auto b : used_blocks) { for (const auto b : blocks) {
if (blocks.end() != std::find(blocks.begin(), blocks.end(), b)) { positive += aprobs[t][b];
positive += aprobs[t][b];
} else {
auto itr = std::lower_bound(
negatives.begin(), negatives.end(), aprobs[t][b], std::greater {});
negatives.insert(itr, aprobs[t][b]);
if (negatives.size() > negative_sample) {
negatives.resize(negative_sample);
}
}
} }
if (blocks.size() > 0) { if (blocks.size() > 0) {
@ -83,15 +56,7 @@ static void Exec() {
positive = 1; positive = 1;
} }
double negative = 0; std::cout << positive << ' ';
if (negative_sample > 0) {
negative =
std::accumulate(negatives.begin(), negatives.end(), 0.) /
negative_sample;
}
const auto prob = positive * (1-negative);
std::cout << prob << ' ';
} }
std::cout << '\n'; std::cout << '\n';
} }