Skip to content

Fix: Syncing some of the default values between files #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sherholz merged 3 commits into from
Oct 21, 2026
+14 −14
Merged

Fix: Syncing some of the default values between files #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef6bbba
[vmm] Fixing wrong default value for the initial kappa
sherholz Mar 26, 2025
e69f342
[vmm] Syncing default values
sherholz May 31, 2026
87715c4
[cleanup] Fixing typo
sherholz May 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions openpgl/directional/vmm/AdaptiveSplitandMergeFactory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ struct AdaptiveSplitAndMergeFactory
{
typename WeightedEMFactory::Configuration weightedEMCfg;

float splittingThreshold{0.75f};
float mergingThreshold{0.00625f};
float splittingThreshold{0.5f};
float mergingThreshold{0.025f};

bool useSplitAndMerge{true};

Expand Down
6 changes: 3 additions & 3 deletions openpgl/directional/vmm/ParallaxAwareVonMisesFisherWeightedEMFactory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ struct ParallaxAwareVonMisesFisherWeightedEMFactory

float maxKappa{OPENPGL_MAX_KAPPA};
float maxMeanCosine{KappaToMeanCosine<float>(OPENPGL_MAX_KAPPA)};
float convergenceThreshold{0.0025f};
float convergenceThreshold{0.005f};

// MAP prior parameters
// weight prior
float weightPrior{0.1f};
float weightPrior{0.01f};

// concentration/meanCosine prior
float meanCosinePriorStrength{0.1f};
float meanCosinePriorStrength{0.2f};
float meanCosinePrior{0.0f};

void init();
Expand Down
16 changes: 8 additions & 8 deletions openpgl/directional/vmm/VMMChiSquareComponentSplitter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,16 +252,16 @@ void VonMisesFisherChiSquareComponentSplitter<TVMMFactory>::PerformSplitting(VMM
{
// std::cout << "split[" << k << "]: idx:" << splitComps[k].componentIndex << "\t chi2: " << splitComps[k].chiSquareEst << std::endl;
#ifndef OPENPGL_USE_THREE_SPLIT
bool splitSucess = SplitComponent(vmm, splitStatistics, suffStatistics, splitComps[k].componentIndex);
bool splitSuccess = SplitComponent(vmm, splitStatistics, suffStatistics, splitComps[k].componentIndex);
mask.setToTrue(splitComps[k].componentIndex);
mask.setToTrue(vmm._numComponents - 1);
#else
bool splitSucess = SplitComponentIntoThree(vmm, splitStatistics, suffStatistics, splitComps[k].componentIndex);
bool splitSuccess = SplitComponentIntoThree(vmm, splitStatistics, suffStatistics, splitComps[k].componentIndex);
mask.setToTrue(splitComps[k].componentIndex);
mask.setToTrue(vmm._numComponents - 2);
mask.setToTrue(vmm._numComponents - 1);
#endif
if (splitSucess)
if (splitSuccess)
{
stopSplitting = false;
}
Expand Down Expand Up @@ -330,22 +330,22 @@ void VonMisesFisherChiSquareComponentSplitter<TVMMFactory>::PerformRecursiveSpli
if (splitComps[k].chiSquareEst > splitThreshold && vmm._numComponents < VMM::MaxComponents)
{
#ifndef OPENPGL_USE_THREE_SPLIT
bool splitSucess = SplitComponent(vmm, splitStatistics, tempSuffStatistics, splitComps[k].componentIndex);
if (splitSucess)
bool splitSuccess = SplitComponent(vmm, splitStatistics, tempSuffStatistics, splitComps[k].componentIndex);
if (splitSuccess)
{
mask.setToTrue(splitComps[k].componentIndex);
mask.setToTrue(vmm._numComponents - 1);
}
#else
bool splitSucess = SplitComponentIntoThree(vmm, splitStatistics, tempSuffStatistics, splitComps[k].componentIndex);
if (splitSucess)
bool splitSuccess = SplitComponentIntoThree(vmm, splitStatistics, tempSuffStatistics, splitComps[k].componentIndex);
if (splitSuccess)
{
mask.setToTrue(splitComps[k].componentIndex);
mask.setToTrue(vmm._numComponents - 1);
mask.setToTrue(vmm._numComponents - 2);
}
#endif
if (splitSucess)
if (splitSuccess)
{
numSplits++;
}
Expand Down
2 changes: 1 addition & 1 deletion openpgl/include/openpgl/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ extern "C"

// weighted EM arguments
size_t initK{PGL_VMM_MAX_COMPONENTS / 2};
float initKappa{0.5f};
float initKappa{5.0f};

size_t maxK{PGL_VMM_MAX_COMPONENTS};
size_t maxEMIterrations{100};
Expand Down
Loading