mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-05 10:59:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

GCC fixes, fixed unit tests

Browse Source
This commit is contained in:
Alexander Bock
2014-09-28 03:03:24 +02:00
parent e6ab0f51fc
commit 83e7398fee
3 changed files with 86 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/tests/test_spicemanager.inl
+8 -11
View File
@@ -59,14 +59,14 @@ double abs_error = 0.00001;
// In this testclass only a handset of the testfunctions require a single kernel.
// The remaining methods rely on multiple kernels, loaded as a SPICE 'meta-kernel'.
#define KERNEL(param, name) int kernelID = -1; \
kernelID = openspace::SpiceManager::ref().loadKernel(param, name); \
#define KERNEL(param) int kernelID = -1; \
kernelID = openspace::SpiceManager::ref().loadKernel(param); \
EXPECT_TRUE(kernelID != -1) << "loadKernel did not return proper id"; \
return kernelID; \
int loadMetaKernel() { KERNEL(META , "METAKERNEL" ); }
int loadLSKKernel() { KERNEL(LSK , "LEAPSECONDS"); }
int loadPCKKernel() { KERNEL(PCK , "CASSINI_PCK"); }
int loadMetaKernel() { KERNEL(META); }
int loadLSKKernel() { KERNEL(LSK); }
int loadPCKKernel() { KERNEL(PCK); }
std::string fileType(char type[]){
std::string str(type);
@@ -108,8 +108,7 @@ TEST_F(SpiceManagerTest, unloadKernelString){
ASSERT_TRUE(found == SPICETRUE);
//unload using string keyword
bool unloaded = openspace::SpiceManager::ref().unloadKernel("LEAPSECONDS");
EXPECT_TRUE(unloaded);
openspace::SpiceManager::ref().unloadKernel(LSK);
found = SPICEFALSE;
kdata_c(0, "text", FILLEN, TYPLEN, SRCLEN, file, filtyp, source, &handle, &found);
@@ -124,8 +123,7 @@ TEST_F(SpiceManagerTest, unloadKernelInteger){
ASSERT_TRUE(found == SPICETRUE);
//unload using unique int ID
bool unloaded = openspace::SpiceManager::ref().unloadKernel(kernelID);
EXPECT_TRUE(unloaded) << "Kernel did not unload";
openspace::SpiceManager::ref().unloadKernel(kernelID);
found = SPICEFALSE;
kdata_c(0, "text", FILLEN, TYPLEN, SRCLEN, file, filtyp, source, &handle, &found);
@@ -145,8 +143,7 @@ TEST_F(SpiceManagerTest, unloadMetaKernel){
kdata_c(i, "all", FILLEN, TYPLEN, SRCLEN, file, filtyp, source, &handle, &found);
EXPECT_EQ(fileType(filtyp), typeArr[i]) << "One or more kernels did not load properly";
}
bool unloaded = openspace::SpiceManager::ref().unloadKernel("METAKERNEL");
EXPECT_TRUE(unloaded);
openspace::SpiceManager::ref().unloadKernel(META);
for (int i = 0; i < nrMetaKernels; i++){
// the values should by now be unloaded
include/openspace/util/spicemanager.h
+36 -12
View File
@@ -37,7 +37,7 @@ namespace openspace {
class transformMatrix;
class SpiceManager{
class SpiceManager {
public:
/**
* Initializer that initializes the static member.
@@ -81,23 +81,48 @@ public:
* Unloads a SPICE kernel identified by the <code>filePath</code> which was used in
* the loading call to loadKernel. The unloading is done by calling the
* <code>unload_c</code> function.
* http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/unload_c.html
* http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/unload_c.html.
* \param filePath The path of the kernel that should be unloaded, it has to refer to
* a file that was loaded in using the loadKernel method
*/
void unloadKernel(std::string filePath);
// Acessing Kernel Data - Constants and Ids --------------------------------------------- //
/**
* Determines whether values exist for some <code>item</code> for any body,
* identified by it's <code>naifId</code>, in the kernel pool by passing it to the
* <code>bodfnd_c</code> function.
* http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/bodfnd_c.html
* For a description on NAIF IDs, see
* http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html.
* \param naifId NAIF ID code of body
* \param item The item to find
* \return <code>true</code> if the function succeeded, <code>false</code> otherwise
*/
bool hasValue(int naifId, const std::string& item) const;
/**
* Determine whether values exist for some item for any body in the kernel pool.
* For further details, please refer to 'bodfnd_c' in SPICE Docummentation
*
* \param naifId ID code of body.
* \param item Item to find ("RADII", "NUT_AMP_RA", etc.).
* \return Whether the function succeeded or not
* Determines whether values exist for some <code>item</code> for any
* code>body</code> in the kernel pool by passing it to the <code>bodfnd_c</code>
* function.
* http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/bodfnd_c.html
* \param body The name of the body that should be sampled
* \param item The item to find
* \return <code>true</code> if the function succeeded, <code>false</code> otherwise
*/
bool hasValue(int naifId, const std::string& kernelPoolValueName) const;
bool hasValue(const std::string& body, const std::string& item) const;
/**
* Returns the NAIF ID for a specific body. For a description on NAIF IDs, see
* http://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/req/naif_ids.html. The
* <code>id</code> will only be set if the retrieval was successful, otherwise it will
* remain unchanged.
* \param body The body name that should be retrieved
* \param id The ID of the <code>body</code> will be stored in this variable. The
* value will only be changed if the retrieval was successful
* \return <code>true</code> if the <code>body</code> was found, <code>false</code>
* otherwise
*/
bool getNaifIdForBody(const std::string& body, int& id) const;
/**
* Fetch from the kernel pool the double precision values of an
@@ -373,11 +398,10 @@ private:
};
SpiceManager() = default;
~SpiceManager();
SpiceManager(const SpiceManager& c) = delete;
std::vector<KernelInformation> _loadedKernels;
static unsigned int _kernelCount;
static unsigned int _lastAssignedKernel;
static SpiceManager* _manager;
};