Commit ab45fd4f authored by Fabrice  ALLAIN's avatar Fabrice ALLAIN

Merge branch '21-wrong-contact-selection-with-b2m-raptorx-example' into 'master'

Resolve "Wrong contact selection with B2M + RaptorX example"

Closes #21

See merge request bis-aria/ariaec!6
parents e66b293c 5b93f73f
......@@ -1263,11 +1263,11 @@ class AriaEcXMLConverter(AriaXMLConverter):
Returns
-------
"""
if scoremap is not None:
# TODO: implement viterbiscore as scoremap for bbcontacts ?
LOG.info("Using contact scores as selection criteria")
contacts = scoremap.sortedset()[:nb_c]
else:
# TODO: Probleme selection des contacts utilises en l'absence de
......@@ -1280,13 +1280,13 @@ class AriaEcXMLConverter(AriaXMLConverter):
# contacts) => utiliser tout les contact de ce set ou def des
# poids pour selectionner l * f contacts de ce set
if nb_c < len(contactmap.contactset()):
LOG.info(
LOG.warning(
"Initialize sampling for contact selection with seed %s",
self.settings.setup.config['seed'])
random.seed(self.settings.setup.config['seed'])
contacts = random.sample(contactmap.contactset(), nb_c)
else:
LOG.info("Using all contacts")
LOG.warning("Using all contacts")
contacts = contactmap.contactset()[:]
hum_list = [(con1 + 1, con2 + 1) for con1, con2 in contacts]
......
......@@ -935,7 +935,8 @@ class MapFileListReader(object):
elif maptypes[i].lower() in conio.CONTACT_FILE_PARSERS:
self.maps.append(ContactMapFile(filepath,
maptypes[i],
conkit_reader=True))
conkit_reader=True,
sort="raw_score"))
else:
self.maps.append(ContactMapFile(filepath,
maptypes[i],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment