Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

otb
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

7eee49a4

Commit 7eee49a4 authored 7 years ago by Cédric Traizet

Downloads
- Plain Diff

Merge branch 'master' into dev

Conflicts:
	include/AutoencoderModel.txx
	include/DimensionalityReductionModelFactory.txx
	include/cbLearningApplicationBaseDR.h

parents f0b2c8dd ea00ca90

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/cbDimensionalityReduction.cxx 1 addition, 1 deletion

app/cbDimensionalityReduction.cxx
app/cbDimensionalityReductionTrainer.cxx 3 additions, 5 deletions

app/cbDimensionalityReductionTrainer.cxx
app/cbDimensionalityReductionVector.cxx 31 additions, 50 deletions

app/cbDimensionalityReductionVector.cxx
include/ImageDimensionalityReductionFilter.txx 1 addition, 1 deletion

include/ImageDimensionalityReductionFilter.txx
include/PCAModel.txx 0 additions, 3 deletions

include/PCAModel.txx

with 36 additions and 60 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment