v1.7.5 Multiview E.

SugiharaLab · Jan 13, 2021 · e89714f · e89714f
1 parent 6845737
commit e89714f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/API.cc b/src/API.cc
@@ -520,13 +520,17 @@ MultiviewValues Multiview( DataFrame< double > & DF,
                            bool        verbose,
                            unsigned    nThreads )
 {
+    // Note: Method::Simplex & embedded = false
+    //       Parameters constructor calls Validate()
+    //       If embedded = true: Validate() will set E to number of columns
+    //       We need E to pass to PrepareEmbedding() : EmbedData()
     Parameters parameters = Parameters( Method::Simplex,
                                         "",           // pathIn
                                         "",           // dataFile
                                         pathOut,      // 
                                         predictFile,  // 
                                         lib,          // lib_str
-                                        pred    ,     // pred_str
+                                        pred,         // pred_str
                                         E,            // 
                                         Tp,           // 
                                         knn,          // 
@@ -535,7 +539,7 @@ MultiviewValues Multiview( DataFrame< double > & DF,
                                         exclusionRadius,
                                         columns,      // 
                                         target,       // 
-                                        true,         // embedded true
+                                        false,        // embedded false
                                         false,        // const_predict
                                         verbose,      // 
                                         "",           // SmapFile

diff --git a/src/Multiview.cc b/src/Multiview.cc
@@ -82,9 +82,7 @@ void MultiviewClass::Project( unsigned nThreads ) {
 
     CheckParameters();
 
-    // Set embedded false so E-dimensional embedding is computed
-    parameters.embedded = false;
-
+    // Note: embedded false so E-dimensional embedding is computed
     PrepareEmbedding(); // EmbedData(). target, data, lib/pred adjust
 
     SetupParameters();  // Requires valid embedding

diff --git a/src/Parameter.cc b/src/Parameter.cc
@@ -86,7 +86,7 @@ Parameters::Parameters(
 
     // Set validated flag and instantiate Version
     validated        ( false ),
-    version          ( 1, 7, 4, "2021-01-09" )
+    version          ( 1, 7, 5, "2021-01-13" )
 {
     // Constructor code
     if ( method != Method::None ) {