Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
dream
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
dream
Commits
e503288f
Commit
e503288f
authored
Mar 13, 2014
by
panos
Committed by
Jérome Perrin
Mar 13, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change the output of Exponential distribution
parent
187d55e8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
dream/KnowledgeExtraction/DistributionFitting.py
dream/KnowledgeExtraction/DistributionFitting.py
+4
-4
No files found.
dream/KnowledgeExtraction/DistributionFitting.py
View file @
e503288f
...
@@ -71,10 +71,10 @@ class Distributions:
...
@@ -71,10 +71,10 @@ class Distributions:
data
=
robjects
.
FloatVector
(
data
)
data
=
robjects
.
FloatVector
(
data
)
rFitDistr
=
robjects
.
r
[
'fitdistr'
]
rFitDistr
=
robjects
.
r
[
'fitdistr'
]
try
:
try
:
self
.
Exp
=
rFitDistr
(
data
,
'Exp'
)
self
.
Exp
=
rFitDistr
(
data
,
'Exp
onential
'
)
except
RRuntimeError
:
except
RRuntimeError
:
return
None
return
None
myDict
=
{
'distributionType'
:
'Exp
onential'
,
'aParameter'
:
'rate
'
,
'aParameterValue'
:
self
.
Exp
[
0
][
0
]}
myDict
=
{
'distributionType'
:
'Exp
'
,
'aParameter'
:
'mean
'
,
'aParameterValue'
:
self
.
Exp
[
0
][
0
]}
return
myDict
return
myDict
def
Poisson_distrfit
(
self
,
data
):
def
Poisson_distrfit
(
self
,
data
):
...
@@ -335,9 +335,9 @@ class DistFittest:
...
@@ -335,9 +335,9 @@ class DistFittest:
self
.
Lognormal_distrfit
(
data
)
self
.
Lognormal_distrfit
(
data
)
myDict
=
{
'distributionType'
:
list1
[
b
],
'aParameter'
:
'logmean'
,
'bParameter'
:
'logsd'
,
'aParameterValue'
:
self
.
Lognormal
[
0
][
0
],
'bParameterValue'
:
self
.
Lognormal
[
0
][
1
]}
myDict
=
{
'distributionType'
:
list1
[
b
],
'aParameter'
:
'logmean'
,
'bParameter'
:
'logsd'
,
'aParameterValue'
:
self
.
Lognormal
[
0
][
0
],
'bParameterValue'
:
self
.
Lognormal
[
0
][
1
]}
return
myDict
return
myDict
elif
list1
[
b
]
==
'Exp
onential
'
:
elif
list1
[
b
]
==
'Exp'
:
self
.
Exponential_distrfit
(
data
)
self
.
Exponential_distrfit
(
data
)
myDict
=
{
'distributionType'
:
list1
[
b
],
'aParameter'
:
'
rate
'
,
'aParameterValue'
:
self
.
Exp
[
0
][
0
]}
myDict
=
{
'distributionType'
:
list1
[
b
],
'aParameter'
:
'
mean
'
,
'aParameterValue'
:
self
.
Exp
[
0
][
0
]}
return
myDict
return
myDict
elif
list1
[
b
]
==
'Poisson'
:
elif
list1
[
b
]
==
'Poisson'
:
self
.
Poisson_distrfit
(
data
)
self
.
Poisson_distrfit
(
data
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment