Changeset 467 for trunk/yao

Timestamp:

10/25/10 20:13:51 (14 years ago)

Author:

yerima

Message:

In the uploading of an existing project.

Location:

trunk/yao/src/interface

Files:

• Yao9Generator (modified) (previous)
• projects/demo/demo.d (modified) (1 diff)
• src/MainWindow.cpp (modified) (7 diffs)

trunk/yao/src/interface/projects/demo/demo.d

@@ -15 +15 @@
 #SPACE name type dim1 [[dim2]---[dim3]] traj ---------------------------------------------------
 space soc_0 M 1 3 5 toc_1
+
+#NETWARD netname indegree outdegree
+netward NNRhoatmvis 6 1
+netward NNTu        4 1
+netward NNTd        4 1
+netward NNInvtau    9 1
+
+#INSERTFCT
+insert_fct arg xinit_rand
+insert_fct arg xinit_lin
+insert_fct arg xload_mod
+insert_fct arg xinit_Aphs_1
+insert_fct  xinit_Aphs_2
+insert_fct arg xread_tabC
+insert_fct arg xinv
+insert_fct arg xcheck_target
+insert_fct arg xperturb
+insert_fct arg xnorm
+insert_fct     xset_minmax

trunk/yao/src/interface/src/MainWindow.cpp

@@ -616 +616 @@
 void MainWindow::openProject()  { // Affiche la fenetre nouveau projet lorsqu'elle est appelée.
 
-        //filename += ".d";
-
-            // Initilization of the lexer and lexing (wrapped from the object tokenizer)
-               //  Tokenizer tokenizer("demo.d");
-            //         // Initialization of the parser and parsing (wrapped from the object tokenizer)
-            //             Translator translator(tokenizer);
-            //                 // Code generation of the files Y1ProjectName.h and Y2ProjectName.h
-            //                     translator.generateCode();
-            //                         exitStatus = EXIT_SUCCESS;
-            //                             //cout << "End application" << endl;
-            //
-
 
         QFileDialog *dialogue = new QFileDialog(this); //Crée une boite de dialogue
@@ -645 +633 @@
                 test = builder.readAll();//the results are saved in a string format.
                 istringstream iss(test.toStdString()); //To have each word that compose the string.
-                FilePath aString, theShape, name, parent, aType, boot, offset, step, size;
+                FilePath aString, theShape, name, parent, aType, boot, offset, step, size, netname, indegree, outdegree, arg;
                 vector <int> theShapeVector;
 
                 while ( getline(iss, aString, '\n' ) ) // Here we notified that the words in the string are separated by "\n"
                         {
+                                //For DEFVAL
                                 if (aString.getExtension() == ".def1")//
                                 {                       
@@ -660 +649 @@
                                         theConstantTable.push_back(aConstant);
                                 }
+                                //For HATNAME
                                 if (aString.getExtension() == ".h")
                                 {
@@ -665 +655 @@
                                         theHeaderList.push_back(aString);       
                                 }
+                                //For TRAJ
                                 if (aString.getExtension() == ".traj1"){
                                         name = aString.getTitle();
@@ -694 +685 @@
 
                                 }               //theConstantTable.push_back(aString.getTitle());
+                                //For SPACE
                                 if (aString.getExtension() == ".sp1")//{
                                         name = aString.getTitle();
@@ -713 +705 @@
                                         theShapeVector.clear();
                                         
-                                }       
+                                }
+                                //For NETWARD   
+                                if (aString.getExtension() == ".nw1") {
+                                        netname = aString.getTitle(); 
+                                }
+
+                                if (aString.getExtension() == ".nw2") {
+                                        indegree = aString.getTitle(); 
+                                }
+
+                                if (aString.getExtension() == ".nw3") {
+                                        outdegree = aString.getTitle(); 
+                                        
+                                        theNeuronTable.push_back(Neuron(netname, m_netwardWindow->toInt(indegree), m_netwardWindow->toInt(outdegree)));
+                                }
                                 /*if (aString.getExtension() == ".op1") {
                                         parent = aString.getTitle(); 
@@ -722 +728 @@
                                         
                                 }*/
+                                //For INSERTFCT 
+                                if (aString.getExtension() == ".fct1") {
+                                        arg = aString.getTitle(); 
+                                        //cout << parent << endl;
+                                }
+                                if (aString.getExtension() == ".fct2") {
+                                        bool aBool;
+                                        parent = aString.getTitle();
+                                        aBool = arg.empty() ? false : true ; 
+                                        theFunctionTable.push_back(Function(parent, aBool));
+                                        //cout << parent << endl;
+                                }
                         }