Skip to content
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.

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

Feature/resources #42

Open
wants to merge 28 commits into
base: master
Choose a base branch
from

Conversation

HannesBachter
Copy link
Contributor

added metric for resources

.idea/atf.iml Outdated
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove all .idea*-files

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How do I do that? Just remove them or use some git-magic?

@@ -15,6 +15,7 @@ def parse_parameter(self, testblock_name, params):
Method that returns the metric method with the given parameter.
:param params: Parameter
"""
print "pathlength params:", params
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove

del metric['groundtruth_epsilon']
except (TypeError, KeyError):
rospy.logwarn(
"No groundtruth parameters given, skipping groundtruth evaluation for metric 'path_length' in testblock '%s'",
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

metric 'ressources'

metrics = CalculateResources(self.params)

metrics = []

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add block for checking list type

        if type(params) is not list:
            rospy.logerr("metric config not a list")
            return False

groundtruth_result = False

#print "node data: ", self.node_data, "\n groundthruth result", groundtruth_result, " \n .................................."
return "resources", self.node_data, groundtruth_result, self.groundtruth, self.groundtruth_epsilon, "*resources details*"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's use details = None if there is no usefull things to wrap in here. see https://github.com/ipa-fmw/atf/blob/master/atf_metrics/src/atf_metrics/calculate_time.py#L68

self.test_config = config_file
def __init__(self, write_lock, bag_file_writer):
self.topic_prefix = "atf/"
file = "/home/fmw-hb/workshop_catkin_ws/src/msh_test/hannes_test_msh/config/test_configs/test2.yaml"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

where can I get the test config (or the path to it) from?

counter += 1

elif msg.trigger == TestblockTrigger.STOP:
print "STOP Trigger"

def create_testblock_list(self):
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there a chance to get the testblock list from somewhere else?

fmw-hb added 11 commits March 21, 2017 15:45
Conflicts:
	.gitignore
	atf_core/src/atf_core/recorder.py
	atf_metrics/config/metrics.yaml
	atf_metrics/src/atf_metrics/check_localization.py
	atf_presenter/scripts/presenter.py
	hannes_test/config/test_configs/test1.yaml
	hannes_test/config/test_generation_config.yaml
	hannes_test/config/test_suites.yaml
	hannes_test/launch/application.launch
	hannes_test/scripts/application.py
self.test_config = config_file
def __init__(self, write_lock, bag_file_writer):
self.topic_prefix = "atf/"
file = "/home/fmw-hb/atf_catkin_ws/src/atf/hannes_test/config/test_configs/test1.yaml"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need to get the test config otherwise, but don't know how

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants