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.

Sign up for GitHub

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

Jump to bottom

Django18 #26

Merged
merged 53 commits into from
Jul 26, 2015
Merged

Django18 #26

merged 53 commits into from
Jul 26, 2015

Conversation

bport
Copy link
Contributor

@bport bport commented Jul 25, 2015

Merge master in django1.8 branch

digitalfox and others added 30 commits May 12, 2015 09:06
@digitalfox
Add some color in this grey world
91b2bc4
@digitalfox
First release of tag learn model
12c95f2
@digitalfox
Use sklearn cross_val function instead of homemade stuff
5ead14a
@digitalfox
some tuning after playing with Grid CV. Need deeper test with proper
3618581 
scoring function
@digitalfox
Slight enhancement of test function to get the mean value. Still way too
605d9de 
much deviation...
@digitalfox
Add other meanful leads fields into analsys for tag learning.
a7d9d21 
Oh, and remove way too early optimization (you know, one of the root of
        evil)
@digitalfox
Don't break tests when optional scikit learn modules are not installed
96414a4
@digitalfox
Fix mission proba according to lead proba. Fix learn model when too few
008d3b9 
leads are available
@digitalfox
Integrate tag suggestion computed with scikit learn. Remove
1c3990b 
taggit_suggest
@agateau
Define a memory cache by default in settings
8c124e4 
Otherwise caching is useless.
@agateau
clientcompany_detail: unbreak "New administrative contact" link
3aa6e48 
Django was formatting company.id as a number, inserting a space in it as a
thousand delimiter. This broke the link. Marking it as safe prevents that.
@agateau
Implement an abstraction layer to check for feature access
e15e954
@agateau
Restrict by features
f6cc639
@agateau
New feature: leads_list_all
9c5f207
@agateau
New feature: leads_profitability
3a38cd6
@agateau
New feature: contacts_write
7fada24
@agateau
Reword feature descriptions to make it easier to find in the list
54acacf
@agateau
New feature: staffing
4e65303
@agateau
New features: timesheet_all and timesheet_current_month
003cc06
@agateau
New feature: menubar
12ad8c1
@agateau
Remove the need to have the staffing.change_staffing perm
49d179a 
Users can still do mass staffing as long as they have the "staffing_mass"
feature without getting the right to alter any row in the staffing table.
@digitalfox
Fix tag features extraction for one lead
c664bfd
@digitalfox
Use cross validation for tag learn model. 84% accuracy. Yeah.
0f3161a
@digitalfox
Merge branch 'tag_learn'
58cdfa5 
Conflicts:
	leads/learn.py
@digitalfox
Fix corner case: Tag was removed or two tag with same name (bad data
a7b59c7 
        before data cleaning)
@digitalfox
Compress model to save some memory and work around memcached client
b4c6684 
limitation
@digitalfox
Add some tips about scikit learn
8ac50f9
@digitalfox
Merge branch 'master' into pr/features
655a28f 
Conflicts:
	core/tests.py
@digitalfox
Fix tag capitalize and add test
853eed1
@digitalfox
Remove keepUpper args. Always keep upper words that was all upper
7bc7708
digitalfox and others added 21 commits May 23, 2015 23:44
@digitalfox
Tag model tuning. Now 85~87% score ! Add Grid search cross val function
124fe60
@digitalfox
use pipeline for state model
09c63ff
@digitalfox
Enhance state model (60 => 70% score !). Add Grid search cross
eed2d74 
validation function.
@digitalfox
Merge branch 'pr/features'
ce0b6f9 
Conflicts:
	core/tests.py
@digitalfox
python 2.6 compat
a7a5815
@digitalfox
Add detailed eval function of state model
9de4990
@digitalfox
Rework of state model
89d33d5 
- remove SLEEPING class. That's a transition state that cannot be learned properly
- remove subsidiary feature (linked to responsible)
- change classifier (logistic) param. Use L2 penalty and higher C1 to smooth %proba. Use auto class weight to better predict non-WON leads
- change proba from float to int
- display top 10 coef of each class in model eval function
@digitalfox
Use tag slug to ease interpretation. Display log coef and sort coef.
ace0401
@digitalfox
Add lead rank
294b9f4
@digitalfox
Fix infamous mix of number format in financial control extract
7130635
@digitalfox
Don't repeat client name for each lead, we already know it
0b4eeeb
@digitalfox
Use staffing manager instead of HR manager to define team in financial
a609180 
control extract
@digitalfox
Make start_date mandatory once offer are sent
136e526
@digitalfox
Translation update
75678af
@digitalfox
Remove old deps
42e7946
@digitalfox
Add start/end date for forecasted and done financial extraction data
7a43251
@digitalfox
Fix bug when quantity and/or unit price is decimal
255db1d
@bport
Merge remote-tracking branch 'upstream/master' into udjango18
8be526a 
# Conflicts:
#	core/migrations/0001_initial.py
#	core/utils.py
#	requirements.txt
#	staffing/views.py
@bport
Remove a South migration
df1abe5
@bport
Remove an empty models (latest versions of Django didn't need it anym…
e84cfe7 
…ore)
@bport
Change requirement for django-permissions use updated fork
68ea93c
@landscape-bot
Copy link

Code Health
Repository health increased by 0.14% when pulling 68ea93c on bport:django18-2 into af9c529 on digitalfox:django18.

@digitalfox digitalfox merged commit b195335 into digitalfox:django18 Jul 26, 2015
abessette pushed a commit to abessette/pydici that referenced this pull request Mar 9, 2023
@bport
Merge pull request digitalfox#26 from digitalfox/master
551a56e 
translation update
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@bport @landscape-bot @digitalfox @agateau