Commit Graph

224 Commits (9b1918c085785c20efc07b65ed153a05012c5f8d)

Author SHA1 Message Date
Frank Dellaert ed9a216365 Switch to using HybridGaussianProductFactor 2024-10-05 07:18:19 +09:00
Frank Dellaert 3797996e89 Store the values 2024-10-01 16:43:14 -07:00
Frank Dellaert 3b50ba9895 FIX BUG: don't skip discrete factors! 2024-09-30 16:27:36 -07:00
Frank Dellaert d054a041ed choose docs 2024-09-30 16:27:36 -07:00
Frank Dellaert 64513eb6d9 discretePosterior for graphs 2024-09-30 16:27:36 -07:00
Frank Dellaert a898ad3661 discretePosterior 2024-09-30 16:27:36 -07:00
Frank Dellaert 3cd816341c refactor printErrors 2024-09-30 12:50:36 -07:00
Varun Agrawal cfebf0cca0 formatting 2024-09-29 10:26:14 -04:00
Frank Dellaert ea54525d37 Make hybrid elimination a method of HGFG 2024-09-28 19:53:22 -07:00
Frank Dellaert bc25fcea4d major improvement: continuousSeparator no longer needed 2024-09-27 07:54:47 -07:00
Frank Dellaert 08cf399bbf Fix all call sites 2024-09-26 13:07:10 -07:00
Frank Dellaert b45ba003ca Simplify all call sites 2024-09-26 11:29:03 -07:00
Varun Agrawal 9b3176e5ef better naming 2024-09-23 15:55:27 -04:00
Varun Agrawal 31519f48b4 rename to negLogProbability 2024-09-23 15:09:37 -04:00
Varun Agrawal 5da7588b66 factor errors in negative log space 2024-09-23 15:08:12 -04:00
Varun Agrawal e09344c6ba replace errorConstant with negLogConstant 2024-09-23 03:37:09 -04:00
Varun Agrawal 2d2213e880 add errorConstant method and use it for logNormalizationConstant in Conditional 2024-09-22 22:11:23 -04:00
Varun Agrawal ceb9496e7c update hybrid code to use -log(k) consistently 2024-09-21 05:17:11 -04:00
Varun Agrawal 939fdcc720 HybridGaussianFactorGraph::errorTree is better encompassing 2024-09-20 16:20:49 -04:00
Varun Agrawal d145872916 comment update 2024-09-20 15:30:24 -04:00
Varun Agrawal cd3c590f32 common errorTree method and its use in HybridGaussianFactorGraph 2024-09-20 12:24:08 -04:00
Varun Agrawal 6929d62300 rename asMixture to asHybrid 2024-09-18 16:52:00 -04:00
Varun Agrawal 4016de7942 update variables and docstrings to remove the mixture terminology 2024-09-18 16:51:58 -04:00
Varun Agrawal 97eb6bc8b9 renaming 2024-09-16 13:28:29 -04:00
Varun Agrawal 0ee9aac434 update other classes with correct types 2024-09-14 14:54:49 -04:00
Varun Agrawal 5ceda1e157 update HybridGaussianFactor to allow for tree of pairs 2024-09-14 13:54:51 -04:00
Varun Agrawal 0bbf16bf4b HybridGaussianFactor tests passing 2024-09-13 17:37:29 -04:00
Varun Agrawal 629989f9ee formatting 2024-09-13 06:20:46 -04:00
Varun Agrawal 035c92a38f finalize renaming 2024-09-13 05:59:56 -04:00
Varun Agrawal aef273bce8 rename GaussianMixture to HybridGaussianConditional 2024-09-13 05:41:24 -04:00
Varun Agrawal 6a92db62c3 rename GaussianMixtureFactor to HybridGaussianFactor 2024-09-13 00:24:18 -04:00
Varun Agrawal cdcc64407e
Merge pull request #1713 from borglab/model-selection-bayestree 2024-09-05 15:12:11 -04:00
Varun Agrawal 8f65f058e0 clean up code 2024-09-04 15:18:58 -04:00
Varun Agrawal 06ecf00dba improve docs when computing discreteSeparator 2024-09-03 15:27:33 -04:00
Varun Agrawal 1673c47ea0 unpack HybridConditional in errorTree 2024-08-29 14:23:18 -04:00
Varun Agrawal b463704926 improved HybridGaussianFactorGraph::printErrors 2024-08-29 13:37:28 -04:00
Varun Agrawal 3dab868ef0 rename from exponentiateLogProbabilities to probabilitiesFromLogValues 2024-08-28 12:47:24 -04:00
Varun Agrawal f4830baa5e common logProbability normalization function 2024-08-26 17:27:44 -04:00
Varun Agrawal f06777fe7a Merge branch 'working-hybrid' into model-selection-bayestree 2024-08-25 01:53:33 -04:00
Varun Agrawal 7358effe03 allow for GaussianMixtureFactors with 0 continuous keys 2024-08-25 00:49:28 -04:00
Varun Agrawal 9acf127f1d Merge branch 'develop' into model-selection-bayestree 2024-08-24 05:26:43 -04:00
Varun Agrawal eef9765e4a normalize the discrete factor at the continuous-discrete boundary 2024-08-20 16:29:02 -04:00
Varun Agrawal fd2062b207 remove changes so we can break up PR into smaller ones 2024-08-20 15:48:07 -04:00
Varun Agrawal 37c6484cbd Merge branch 'model-selection-integration' into model-selection-bayestree 2024-08-20 14:11:10 -04:00
Varun Agrawal 2430abb4bc test for different error values in BN from MixtureFactor 2024-08-07 09:22:38 -04:00
Varun Agrawal 113a7f8e6b added more comments and compute GaussianMixture before tau 2024-08-06 12:58:44 -04:00
Varun Agrawal f62805f8b3 add method to select underlying continuous Gaussian graph given discrete assignment 2024-02-23 12:49:51 -05:00
Varun Agrawal f12a24e00c fix comment 2024-02-19 11:33:13 -05:00
Varun Agrawal 6d7dc57599 additional clarifying comments 2024-02-17 23:10:37 -05:00
Varun Agrawal a80b5d4f5a Merge branch 'hybrid-printerrors' into model-selection-integration 2024-01-05 15:06:01 -05:00
Varun Agrawal 7ea1bbcfc3 replace error with errorTree 2024-01-05 15:04:15 -05:00
Varun Agrawal ee5bda9714 Merge branch 'discrete-error' into hybrid-printerrors 2024-01-05 14:47:28 -05:00
Varun Agrawal bc3b96a6e8 rename error to errorTree when it returns an AlgebraicDecisionTree 2024-01-05 03:24:50 -05:00
Varun Agrawal 9ad7697e5b Merge branch 'hybrid-printerrors' into model-selection-integration 2024-01-04 13:53:22 -05:00
Varun Agrawal 8d3500426e Merge branch 'discrete-error' into hybrid-printerrors 2024-01-04 13:47:11 -05:00
Varun Agrawal 0d058100e5 update wrapper for LM with Ordering parameter 2024-01-03 14:44:12 -05:00
Frank Dellaert fcda1536c6 Cleaner version of eliminate 2023-12-22 14:53:45 -08:00
Varun Agrawal 07ddec5f4b remove stray comment 2023-12-21 14:19:21 -05:00
Varun Agrawal 36604297d7 handle numerical instability 2023-12-18 14:26:54 -05:00
Varun Agrawal 6f09be51cb error normalization and log-sum-exp trick 2023-12-17 18:55:15 -05:00
Varun Agrawal cd5c13065b remove extra newline 2023-11-20 13:58:52 -05:00
Varun Agrawal 5387299b8b use correct key formatter 2023-11-14 04:48:23 -05:00
Varun Agrawal 114a0b220b printErrors method for HybridGaussianFactorGraph 2023-11-12 22:32:58 -05:00
Varun Agrawal 90a9e6f746 report correct error for discreteElimination 2023-11-09 15:37:15 -05:00
Varun Agrawal df0c5d7ca0 remove timers 2023-07-24 19:23:16 -04:00
Varun Agrawal f4adfac4fa Undo TableFactor return in Hybrid GFG so we can group the changes together 2023-07-17 13:00:38 -04:00
Varun Agrawal f6b1872b13 initial changes 2023-07-17 13:00:38 -04:00
Varun Agrawal 4e13fb717b simplify HybridEliminate 2023-07-17 13:00:38 -04:00
Varun Agrawal 59e26ee79d remove timers 2023-07-17 10:51:33 -04:00
Varun Agrawal 2b72f75a07 add timing checkpoints 2023-07-17 09:14:59 -04:00
Varun Agrawal 9531506492 rename variables to be agnostic to underlying data structure 2023-07-17 09:14:17 -04:00
Varun Agrawal c46bed7e52 fix hybrid timing calls to allow working with outer scope 2023-03-17 17:59:51 -04:00
Varun Agrawal 8ba5da44a6 some cleanup 2023-03-01 14:44:40 -05:00
Varun Agrawal 765e73879b Add better hybrid support 2023-02-13 19:40:38 -05:00
Frank Dellaert a8eb98acea Fixed warnings that arise from stricter compiler flags 2023-02-11 12:32:50 -08:00
Frank Dellaert ae7c17420d Replace std::tie with c++17 pattern matching 2023-02-04 10:28:14 -08:00
kartik arcot c037e0a1fc replaced casts 2023-01-22 08:40:02 -08:00
kartik arcot 852e8768c0 shared_ptr, make_shared, allocate_shared 2023-01-22 08:40:02 -08:00
Frank Dellaert e444962aad Added correction with the normalization constant in the second elimination path. 2023-01-17 07:47:56 -08:00
Frank Dellaert 519b2bb515 Added comment 2023-01-16 18:56:25 -08:00
Frank Dellaert e31884c9a1 Eradicated GraphAndConstant 2023-01-16 18:28:12 -08:00
Frank Dellaert dfef2c202f Simplify elimination 2023-01-16 10:30:47 -08:00
Frank Dellaert 03ad393e12 Removed FactorAndConstant, no longer needed 2023-01-16 10:30:47 -08:00
Frank Dellaert 83bae7d701 Moved factor graph error(HybridValues) to FactorGraph base class. 2023-01-10 13:50:37 -08:00
Frank Dellaert 691baa56de Fix issue with HybridOrdering 2023-01-08 00:21:51 -08:00
Frank Dellaert 2e233364b6 Merge branch 'develop' into hybrid/refactor
# Conflicts:
#	gtsam/hybrid/HybridGaussianFactorGraph.cpp
#	gtsam/hybrid/tests/testHybridGaussianFactorGraph.cpp
#	python/gtsam/tests/test_HybridNonlinearFactorGraph.py
2023-01-08 00:16:23 -08:00
Frank Dellaert 4e8dc6e34b Remove GaussianFactor wrapper (easy!) 2023-01-06 23:41:08 -08:00
Frank Dellaert a46c53de3e Added handling of naked Gaussian factors added in python 2023-01-06 23:22:56 -08:00
Frank Dellaert 88f27a210a Fixed tests 2023-01-06 23:02:49 -08:00
Frank Dellaert 7e32a8739e Removed HybridDiscreteFactor wrapper 2023-01-06 21:07:51 -08:00
Frank Dellaert 1538452d5a Make HybridFactorGraph just a FactorGraph<Factor> with extra methods 2023-01-06 17:03:55 -08:00
Varun Agrawal e43fd3e8ca Make HybridOrdering a function and use it for Hybrid DefaultOrderingFunc 2023-01-06 10:13:44 -05:00
Varun Agrawal 34daecd7a4 remove deferredFactors 2023-01-04 02:54:34 -05:00
Varun Agrawal 195dddfdeb clean up HybridGaussianFactorGraph 2023-01-03 01:50:16 -05:00
Varun Agrawal 66b846f77e Merge branch 'hybrid/elimination' into hybrid/test_with_evaluate 2023-01-03 01:44:06 -05:00
Frank Dellaert 797ac344fa Same correct error with factor_z.error() 2023-01-02 13:24:28 -05:00
Frank Dellaert 12d02bed1a Right marginals for tiny1 2023-01-02 13:22:16 -05:00
Frank Dellaert f8d75abfeb name change of Sum to GaussianFactorGraphTree and SumFrontals to assembleGraphTree 2023-01-02 13:11:22 -05:00
Varun Agrawal e3a63aa77c check for 0 sum 2023-01-02 10:03:56 -05:00
Varun Agrawal cae98e1d3e rename eliminate to eliminateFunc 2023-01-02 09:44:43 -05:00