mirror of
https://github.com/nqrduck/LimeDriver.git
synced 2024-11-22 10:02:25 +00:00
Optimize JSON output format and type annotations
Refactored the dumpConfig function in C++ to output valid JSON format by changing brackets and refining the argument-value pair structure. This corrects the previous invalid JSON syntax and ensures compatibility with JSON parsers. In Python, enhanced type safety by explicitly annotating in_arg as a dictionary and streamlined parameter initialization by iterating over items directly. This change improves code readability and reduces potential errors during parameter assignment. Fixes issue with JSON serialization and parameter handling.
This commit is contained in:
parent
a4d109dffd
commit
cd76cb4300
2 changed files with 6 additions and 6 deletions
|
@ -265,7 +265,7 @@ void dumpConfig(Config2HDFattr_t *config, size_t size) {
|
||||||
|
|
||||||
int ii_oupargs = 0; // TODO: Better name
|
int ii_oupargs = 0; // TODO: Better name
|
||||||
|
|
||||||
std::cout << "[" << std::endl;
|
std::cout << "{" << std::endl;
|
||||||
|
|
||||||
for (size_t i = 0; i < size; ++i) {
|
for (size_t i = 0; i < size; ++i) {
|
||||||
|
|
||||||
|
@ -280,7 +280,7 @@ void dumpConfig(Config2HDFattr_t *config, size_t size) {
|
||||||
|
|
||||||
// Turn argument-value pairs to JSON objects
|
// Turn argument-value pairs to JSON objects
|
||||||
|
|
||||||
std::cout << "{\"" << arg << "\": \"";
|
std::cout << "\"" << arg << "\": \"";
|
||||||
|
|
||||||
// Need to cast void* data pointer to the correct type
|
// Need to cast void* data pointer to the correct type
|
||||||
// TODO: Do we lose precision here?
|
// TODO: Do we lose precision here?
|
||||||
|
@ -294,7 +294,7 @@ void dumpConfig(Config2HDFattr_t *config, size_t size) {
|
||||||
std::cout << static_cast<char *>(config[i].Value);
|
std::cout << static_cast<char *>(config[i].Value);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::cout << "\"}";
|
std::cout << "\"";
|
||||||
|
|
||||||
if (i < size - 1) {
|
if (i < size - 1) {
|
||||||
std::cout << ",";
|
std::cout << ",";
|
||||||
|
@ -303,7 +303,7 @@ void dumpConfig(Config2HDFattr_t *config, size_t size) {
|
||||||
std::cout << std::endl;
|
std::cout << std::endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::cout << "]" << std::endl;
|
std::cout << "}" << std::endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(int argc, char **argv) {
|
int main(int argc, char **argv) {
|
||||||
|
|
|
@ -40,8 +40,8 @@ class limr:
|
||||||
in_arg = json.loads(p.stdout.read().decode("utf-8"))
|
in_arg = json.loads(p.stdout.read().decode("utf-8"))
|
||||||
|
|
||||||
# initialize the parameters
|
# initialize the parameters
|
||||||
for key in in_arg:
|
for key, value in in_arg.items():
|
||||||
setattr(self, key, in_arg[key][0])
|
setattr(self, key, value)
|
||||||
|
|
||||||
# initialize other variables
|
# initialize other variables
|
||||||
self.parvar = {}
|
self.parvar = {}
|
||||||
|
|
Loading…
Reference in a new issue