~ubuntu-branches/debian/jessie/arb/jessie

« back to all changes in this revision

Viewing changes to PARSIMONY/pars_main.hxx

  • Committer: Package Import Robot
  • Author(s): Elmar Pruesse, Andreas Tille, Elmar Pruesse
  • Date: 2014-09-02 15:15:06 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20140902151506-jihq58b3iz342wif
Tags: 6.0.2-1
[ Andreas Tille ]
* New upstream version
  Closes: #741890
* debian/upstream -> debian/upstream/metadata
* debian/control:
   - Build-Depends: added libglib2.0-dev
   - Depends: added mafft, mrbayes
* debian/rules
   - Add explicite --remove-section=.comment option to manual strip call
* cme fix dpkg-control
* arb-common.dirs: Do not create unneeded lintian dir
* Add turkish debconf translation (thanks for the patch to Mert Dirik
  <mertdirik@gmail.com>)
  Closes: #757497

[ Elmar Pruesse ]
* patches removed:
   - 10_config.makefiles.patch,
     80_no_GL.patch
       removed in favor of creating file from config.makefile.template via 
       sed in debian/control
   - 20_Makefile_main.patch
       merged upstream
   - 21_Makefiles.patch
       no longer needed
   - 30_tmpfile_CVE-2008-5378.patch: 
       merged upstream
   - 50_fix_gcc-4.8.patch:
       merged upstream
   - 40_add_libGLU.patch:
       libGLU not needed for arb_ntree)
   - 60_use_debian_packaged_raxml.patch:
       merged upstream
   - 70_hardening.patch
       merged upstream
   - 72_add_math_lib_to_linker.patch
       does not appear to be needed
* patches added:
   - 10_upstream_r12793__show_db_load_progress:
       backported patch showing progress while ARB is loading a database
       (needed as indicator/splash screen while ARB is launching)
   - 20_upstream_r12794__socket_permissions:
       backported security fix
   - 30_upstream_r12814__desktop_keywords:
       backported add keywords to desktop (fixes lintian warning)
   - 40_upstream_r12815__lintian_spelling:
       backported fix for lintian reported spelling errors
   - 50_private_nameservers
       change configuration to put nameservers into users home dirs
       (avoids need for shared writeable directory)
   - 60_use_debian_phyml
       use phyml from debian package for both interfaces in ARB
* debian/rules:
   - create config.makefile from override_dh_configure target
   - use "make tarfile" in override_dh_install
   - remove extra cleaning not needed for ARB 6
   - use "dh_install --list-missing" to avoid missing files
   - added override_dh_fixperms target
* debian/control:
   - added libarb-dev package
   - Depends: added phyml, xdg-utils
   - Suggests: removed phyml
   - fix lintian duplicate-short-description (new descriptions)
* debian/*.install:
   - "unrolled" confusing globbing to select files
   - pick files from debian/tmp
   - moved all config files to /etc/arb
* debian/arb-common.templates: updated
* scripts:
   - removed arb-add-pt-server
   - launch-wrapper: 
     - only add demo.arb to newly created $ARBUSERDATA
     - pass commandline arguments through bin/arb wrapper
   - preinst: removing old PT server index files on upgrade from 5.5*
   - postinst: set setgid on shared PT dir
* rewrote arb.1 manfile
* added file icon for ARB databases
* using upstream arb_tcp.dat

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#define MIN_SEQUENCE_LENGTH     20
2
 
 
3
 
extern struct NT_global {
4
 
    AW_root *awr;
 
1
// =============================================================== //
 
2
//                                                                 //
 
3
//   File      : pars_main.hxx                                     //
 
4
//   Purpose   :                                                   //
 
5
//                                                                 //
 
6
//   Institute of Microbiology (Technical University Munich)       //
 
7
//   http://www.arb-home.de/                                       //
 
8
//                                                                 //
 
9
// =============================================================== //
 
10
 
 
11
#ifndef PARS_MAIN_HXX
 
12
#define PARS_MAIN_HXX
 
13
 
 
14
#ifndef TREEDISPLAY_HXX
 
15
#include <TreeDisplay.hxx>
 
16
#endif
 
17
 
 
18
#define MIN_SEQUENCE_LENGTH 20
 
19
 
 
20
class AW_root;
 
21
class AWT_graphic_tree;
 
22
class WeightedFilter;
 
23
class AP_tree_nlen;
 
24
class arb_progress;
 
25
 
 
26
class ArbParsimony {
 
27
    AW_root          *awr;
5
28
    AWT_graphic_tree *tree;
6
 
} *GLOBAL_NT;
7
 
 
8
 
AWT_graphic_tree *PARS_generate_tree(AW_root *root);
9
 
 
 
29
 
 
30
public:
 
31
    ArbParsimony(AW_root *awroot) : awr(awroot), tree(NULL) {}
 
32
 
 
33
    AW_root *get_awroot() const { return awr; }
 
34
    AWT_graphic_tree *get_tree() const { return tree; }
 
35
 
 
36
    DEFINE_DOWNCAST_ACCESSORS(AP_tree_nlen, get_root_node, get_tree()->get_root_node());
 
37
 
 
38
    void generate_tree(WeightedFilter *pars_weighted_filter);
 
39
    void optimize_tree(AP_tree *tree, arb_progress& progress);
 
40
    void kernighan_optimize_tree(AP_tree *at);
 
41
};
 
42
 
 
43
void PARS_map_viewer(GBDATA *gb_species, AD_MAP_VIEWER_TYPE vtype);
 
44
 
 
45
#else
 
46
#error pars_main.hxx included twice
 
47
#endif // PARS_MAIN_HXX