Mentions légales du service
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
cadbiom
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VIGNET Pierre
cadbiom
Commits
86d50743
Commit
86d50743
authored
5 years ago
by
VIGNET Pierre
Browse files
Options
Downloads
Patches
Plain Diff
[lib] Fix typos
parent
e3acafbb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
library/cadbiom/commons.py
+7
-0
7 additions, 0 deletions
library/cadbiom/commons.py
library/cadbiom/models/clause_constraints/mcl/MCLAnalyser.py
+4
-6
4 additions, 6 deletions
library/cadbiom/models/clause_constraints/mcl/MCLAnalyser.py
with
11 additions
and
6 deletions
library/cadbiom/commons.py
+
7
−
0
View file @
86d50743
...
@@ -51,6 +51,13 @@ def logger(name=LOGGER_NAME, logfilename=None):
...
@@ -51,6 +51,13 @@ def logger(name=LOGGER_NAME, logfilename=None):
"""
Return logger of given name, without initialize it.
"""
Return logger of given name, without initialize it.
Equivalent of logging.getLogger() call.
Equivalent of logging.getLogger() call.
:Example:
cm.logger(name=__name__)
:param name: Name of the logger, only displayed if
"
%(name)s
"
is present in
the logging.Formatter.
"""
"""
return
logging
.
getLogger
(
name
)
return
logging
.
getLogger
(
name
)
...
...
This diff is collapsed.
Click to expand it.
library/cadbiom/models/clause_constraints/mcl/MCLAnalyser.py
+
4
−
6
View file @
86d50743
...
@@ -373,7 +373,7 @@ class MCLAnalyser(object):
...
@@ -373,7 +373,7 @@ class MCLAnalyser(object):
# inactive_frontier_values = \
# inactive_frontier_values = \
# [[var] for var in dimacs_front_sol.frontier_values if var < 0]
# [[var] for var in dimacs_front_sol.frontier_values if var < 0]
# Intersection between pre-computed negative values for all frontiers
# Intersection between pre-computed negative values for all frontiers
#
and all frontiers
(negative and positive) in the given solution
# (negative and positive) in the given solution
, and all frontiers.
inactive_frontier_values
=
\
inactive_frontier_values
=
\
[[
var
]
for
var
in
[[
var
]
for
var
in
self
.
unfolder
.
frontiers_negative_values
&
dimacs_front_sol
.
frontier_values
]
self
.
unfolder
.
frontiers_negative_values
&
dimacs_front_sol
.
frontier_values
]
...
@@ -683,11 +683,9 @@ class MCLAnalyser(object):
...
@@ -683,11 +683,9 @@ class MCLAnalyser(object):
# list of timed minimal activation conditions on frontier (dimacs code)
# list of timed minimal activation conditions on frontier (dimacs code)
# i.e list<DimacsFrontierSol>
# i.e list<DimacsFrontierSol>
# mac_list = [] # Not used anymore
# mac_list = [] # Not used anymore
forbidden_frontier_values
=
[]
## TODO: parser les properties au format DIMACS une bonne fois pour toutes
# Keep a list of frontier values to be banned in the next search
## et les ajouter dans forbidden_frontier_values
forbidden_frontier_values
=
[]
## Lors du rechargement des places précédentes, le problème du parsing va réapparaitre
# Satisfiability test
# Satisfiability test
reachable
=
self
.
sq_is_satisfiable
(
query
,
max_user_step
)
reachable
=
self
.
sq_is_satisfiable
(
query
,
max_user_step
)
...
@@ -729,7 +727,7 @@ class MCLAnalyser(object):
...
@@ -729,7 +727,7 @@ class MCLAnalyser(object):
break
break
## TEST
## TEST
## Make autoadjustment... of max_steps during the solving
## Make autoadjustment... of max_steps during the solving
!
## Juste appeler squery_solve avec les memes parametres mais
## Juste appeler squery_solve avec les memes parametres mais
## min_step augmenté de 1
## min_step augmenté de 1
## en restant inférieur au nb d'étapes demandées à l'origine
## en restant inférieur au nb d'étapes demandées à l'origine
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment