From: Dominic L. <ma...@us...> - 2005-01-02 14:44:11
|
Update of /cvsroot/robotflow/RobotFlow/demo/SymbolRecog/n-files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19423/demo/SymbolRecog/n-files Modified Files: SymbolTracking.n classifyTemplates.n trainNeuralNet.n Log Message: removing all "using namespace std;" in headers. Bumped version to 0.2.6. Preparing for the RobotFlow namespace. Index: classifyTemplates.n =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/demo/SymbolRecog/n-files/classifyTemplates.n,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** classifyTemplates.n 2 Nov 2004 16:31:38 -0000 1.5 --- classifyTemplates.n 2 Jan 2005 14:44:01 -0000 1.6 *************** *** 56,61 **** </Network> <Network type="iterator" name="LOOP0"> ! <Node name="node_Load_1" type="Load" x="-604.000000" y="412.000000"/> ! <Node name="node_ImageProbe_1" type="ImageProbe" x="-278.000000" y="420.000000"> <Parameter name="HEIGHT" type="int" value="240" description=""/> <Parameter name="WIDTH" type="int" value="320" description=""/> --- 56,61 ---- </Network> <Network type="iterator" name="LOOP0"> ! <Node name="node_Load_1" type="Load" x="-524.000000" y="423.000000"/> ! <Node name="node_ImageProbe_1" type="ImageProbe" x="-198.000000" y="431.000000"> <Parameter name="HEIGHT" type="int" value="240" description=""/> <Parameter name="WIDTH" type="int" value="320" description=""/> *************** *** 78,82 **** <Parameter name="PROBE_NAME" type="string" value="KEYPAD_NAME" description=""/> </Node> ! <Node name="node_Probe_1" type="Probe" x="-146.000000" y="419.000000"> <Parameter name="BREAK_AT" type="int" value="" description=""/> <Parameter name="SHOW" type="bool" value="true" description=""/> --- 78,82 ---- <Parameter name="PROBE_NAME" type="string" value="KEYPAD_NAME" description=""/> </Node> ! <Node name="node_Probe_1" type="Probe" x="-66.000000" y="430.000000"> <Parameter name="BREAK_AT" type="int" value="" description=""/> <Parameter name="SHOW" type="bool" value="true" description=""/> *************** *** 90,109 **** </Node> <Node name="node_Action_2" type="Action" x="-120.000000" y="556.000000"/> ! <Node name="node_PROCESS_TEMPLATE_1" type="PROCESS_TEMPLATE" x="461.000000" y="475.000000"/> ! <Node name="node_Accumulate_1" type="Accumulate" x="787.000000" y="469.000000"/> ! <Node name="node_DCVector_1" type="DCVector" x="203.000000" y="559.000000"> <Parameter name="LENGTH" type="int" value="36" description=""/> <Parameter name="VALUE" type="float" value="-1`" description=""/> </Node> ! <Node name="node_VectorSetIndex_1" type="VectorSetIndex" x="474.000000" y="575.000000"/> ! <Node name="node_Constant_5" type="Constant" x="111.000000" y="575.000000"> <Parameter name="VALUE" type="float" value="1.0" description=""/> </Node> ! <Node name="node_Accumulate_2" type="Accumulate" x="789.000000" y="566.000000"/> ! <Node name="node_Surround_1" type="Surround" x="-523.000000" y="414.000000"> <Parameter name="SPACING" type="int" value="10" description=""/> </Node> <Node name="node_Print_1" type="Print" x="7.000000" y="245.000000"/> ! <Node name="node_NilObject_1" type="NilObject" x="-484.000000" y="446.000000"/> <Node name="node_NilObject_2" type="NilObject" x="-75.000000" y="468.000000"/> <Link from="node_SymbolKeypad_1" output="KEYPAD_ID" to="node_TextProbe_1" input="INPUT">-440 526 -387 588 -299 589 </Link> --- 90,109 ---- </Node> <Node name="node_Action_2" type="Action" x="-120.000000" y="556.000000"/> ! <Node name="node_PROCESS_TEMPLATE_1" type="PROCESS_TEMPLATE" x="338.000000" y="477.000000"/> ! <Node name="node_Accumulate_1" type="Accumulate" x="576.000000" y="470.000000"/> ! <Node name="node_DCVector_1" type="DCVector" x="105.000000" y="559.000000"> <Parameter name="LENGTH" type="int" value="36" description=""/> <Parameter name="VALUE" type="float" value="-1`" description=""/> </Node> ! <Node name="node_VectorSetIndex_1" type="VectorSetIndex" x="299.000000" y="574.000000"/> ! <Node name="node_Constant_5" type="Constant" x="13.000000" y="575.000000"> <Parameter name="VALUE" type="float" value="1.0" description=""/> </Node> ! <Node name="node_Accumulate_2" type="Accumulate" x="558.000000" y="568.000000"/> ! <Node name="node_Surround_1" type="Surround" x="-443.000000" y="425.000000"> <Parameter name="SPACING" type="int" value="10" description=""/> </Node> <Node name="node_Print_1" type="Print" x="7.000000" y="245.000000"/> ! <Node name="node_NilObject_1" type="NilObject" x="-404.000000" y="457.000000"/> <Node name="node_NilObject_2" type="NilObject" x="-75.000000" y="468.000000"/> <Link from="node_SymbolKeypad_1" output="KEYPAD_ID" to="node_TextProbe_1" input="INPUT">-440 526 -387 588 -299 589 </Link> *************** *** 135,140 **** <NetOutput name="ACCUM_OUT" node="node_Accumulate_2" terminal="OUTPUT" object_type="any" description="No description available"/> <Note x="-326" y="350" visible="1" text="Be patient, 1289 templates need to be categorized!"/> ! <Note x="393" y="442" visible="1" text="Templates will be processed in the PROCESS_TEMPLATE network"/> ! <Note x="-595" y="735" visible="1" text="SymbolKeypad will display a simple GUI to allow the user to select which template is displayed in the ImageProbe."/> </Network> <Network type="subnet" name="PROCESS_TEMPLATE"> --- 135,140 ---- <NetOutput name="ACCUM_OUT" node="node_Accumulate_2" terminal="OUTPUT" object_type="any" description="No description available"/> <Note x="-326" y="350" visible="1" text="Be patient, 1289 templates need to be categorized!"/> ! <Note x="263" y="427" visible="1" text="Templates will be processed in the PROCESS_TEMPLATE network"/> ! <Note x="-443" y="755" visible="1" text="SymbolKeypad will display a simple GUI to allow the user to select which template is displayed in the ImageProbe."/> </Network> <Network type="subnet" name="PROCESS_TEMPLATE"> Index: trainNeuralNet.n =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/demo/SymbolRecog/n-files/trainNeuralNet.n,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** trainNeuralNet.n 3 Nov 2004 18:38:14 -0000 1.4 --- trainNeuralNet.n 2 Jan 2005 14:44:01 -0000 1.5 *************** *** 3,7 **** <Document> <Network type="subnet" name="MAIN"> ! <Node name="node_LoadFile_1" type="LoadFile" x="-2327.000000" y="-40.000000"> <Parameter name="FILENAME" type="string" value="../templates/train_in_172_v2.data" description="No description available"/> </Node> --- 3,7 ---- <Document> <Network type="subnet" name="MAIN"> ! <Node name="node_LoadFile_1" type="LoadFile" x="-2196.000000" y="-17.000000"> <Parameter name="FILENAME" type="string" value="../templates/train_in_172_v2.data" description="No description available"/> </Node> *************** *** 19,33 **** </Node> <Node name="node_Length_1" type="Length" x="-2082.000000" y="-79.000000"/> ! <Node name="node_Length_2" type="Length" x="-2085.000000" y="100.000000"/> <Node name="node_SaveAs_1" type="SaveAs" x="-1628.000000" y="0.000000"> <Parameter name="FILENAME" type="string" value="../neural_networks/net_172_7_36.nnet" description="No description available"/> </Node> ! <Link from="node_LoadFile_1" output="OUTPUT" to="node_NNetInit_1" input="TRAIN_IN"/> ! <Link from="node_LoadFile_2" output="OUTPUT" to="node_NNetInit_1" input="TRAIN_OUT"/> ! <Link from="node_NNetInit_1" output="OUTPUT" to="node_TRAIN_LOOP_1" input="INITIALIZED_NNET"/> <Link from="node_LoadFile_1" output="OUTPUT" to="node_TRAIN_LOOP_1" input="TRAIN_IN"/> <Link from="node_LoadFile_2" output="OUTPUT" to="node_TRAIN_LOOP_1" input="TRAIN_OUT"/> ! <Link from="node_LoadFile_1" output="OUTPUT" to="node_Length_1" input="INPUT"/> ! <Link from="node_LoadFile_2" output="OUTPUT" to="node_Length_2" input="INPUT"/> <Link from="node_TRAIN_LOOP_1" output="NNET" to="node_SaveAs_1" input="INPUT"/> <NetOutput name="TRAIN_IN_LENGTH" node="node_Length_1" terminal="OUTPUT" object_type="int" description="The length of the vector"/> --- 19,33 ---- </Node> <Node name="node_Length_1" type="Length" x="-2082.000000" y="-79.000000"/> ! <Node name="node_Length_2" type="Length" x="-2164.000000" y="108.000000"/> <Node name="node_SaveAs_1" type="SaveAs" x="-1628.000000" y="0.000000"> <Parameter name="FILENAME" type="string" value="../neural_networks/net_172_7_36.nnet" description="No description available"/> </Node> ! <Link from="node_LoadFile_1" output="OUTPUT" to="node_NNetInit_1" input="TRAIN_IN">-2165.5 -17 -2165 23 -2110 23.5 </Link> ! <Link from="node_LoadFile_2" output="OUTPUT" to="node_NNetInit_1" input="TRAIN_OUT">-2293.5 -2 -2292 37 -2110 38.5 </Link> ! <Link from="node_NNetInit_1" output="OUTPUT" to="node_TRAIN_LOOP_1" input="INITIALIZED_NNET">-1972 31 -1954 14 -1894 14 </Link> <Link from="node_LoadFile_1" output="OUTPUT" to="node_TRAIN_LOOP_1" input="TRAIN_IN"/> <Link from="node_LoadFile_2" output="OUTPUT" to="node_TRAIN_LOOP_1" input="TRAIN_OUT"/> ! <Link from="node_LoadFile_1" output="OUTPUT" to="node_Length_1" input="INPUT">-2165.5 -17 -2165 -78 -2109 -79 </Link> ! <Link from="node_LoadFile_2" output="OUTPUT" to="node_Length_2" input="INPUT">-2293.5 -2 -2292 108 -2191 108 </Link> <Link from="node_TRAIN_LOOP_1" output="NNET" to="node_SaveAs_1" input="INPUT"/> <NetOutput name="TRAIN_IN_LENGTH" node="node_Length_1" terminal="OUTPUT" object_type="int" description="The length of the vector"/> Index: SymbolTracking.n =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/demo/SymbolRecog/n-files/SymbolTracking.n,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SymbolTracking.n 3 Nov 2004 18:33:25 -0000 1.8 --- SymbolTracking.n 2 Jan 2005 14:44:01 -0000 1.9 *************** *** 83,93 **** </Node> <Node name="node_SKIP_N_1" type="SKIP_N" x="7.000000" y="170.000000"> ! <Parameter name="SKIP_N" type="int" value="15" description="The value"/> </Node> <Node name="node_SKIP_N_2" type="SKIP_N" x="10.000000" y="238.000000"> ! <Parameter name="SKIP_N" type="int" value="15" description="The value"/> </Node> <Node name="node_SKIP_N_3" type="SKIP_N" x="9.000000" y="295.000000"> ! <Parameter name="SKIP_N" type="int" value="15" description="The value"/> </Node> <Node name="node_ComponentsViewer_1" type="ComponentsViewer" x="-75.000000" y="381.000000"/> --- 83,93 ---- </Node> <Node name="node_SKIP_N_1" type="SKIP_N" x="7.000000" y="170.000000"> ! <Parameter name="SKIP_N" type="int" value="10" description="The value"/> </Node> <Node name="node_SKIP_N_2" type="SKIP_N" x="10.000000" y="238.000000"> ! <Parameter name="SKIP_N" type="int" value="10" description="The value"/> </Node> <Node name="node_SKIP_N_3" type="SKIP_N" x="9.000000" y="295.000000"> ! <Parameter name="SKIP_N" type="int" value="10" description="The value"/> </Node> <Node name="node_ComponentsViewer_1" type="ComponentsViewer" x="-75.000000" y="381.000000"/> *************** *** 110,114 **** <Link from="node_NilObject_1" output="VALUE" to="node_SNCRZ30_1" input="TILT_ABS_POS"/> <Link from="node_NilObject_1" output="VALUE" to="node_SNCRZ30_1" input="PAN_ABS_POS"/> ! <Link from="node_NilObject_2" output="VALUE" to="node_Feedback_1" input="BEFORE"/> <Link from="node_NilObject_2" output="VALUE" to="node_Feedback_3" input="BEFORE"/> <Link from="node_READ_1" output="SENTENCE" to="node_TextProbe_1" input="INPUT"/> --- 110,114 ---- <Link from="node_NilObject_1" output="VALUE" to="node_SNCRZ30_1" input="TILT_ABS_POS"/> <Link from="node_NilObject_1" output="VALUE" to="node_SNCRZ30_1" input="PAN_ABS_POS"/> ! <Link from="node_NilObject_2" output="VALUE" to="node_Feedback_1" input="BEFORE">-78.5 312 -5.80059e-270 294 167 253.5 </Link> <Link from="node_NilObject_2" output="VALUE" to="node_Feedback_3" input="BEFORE"/> <Link from="node_READ_1" output="SENTENCE" to="node_TextProbe_1" input="INPUT"/> *************** *** 122,126 **** <Link from="node_Feedback_2" output="DELAY" to="node_SNCRZ30_1" input="PAN_REL_POS">352.5 182.5 531 182 531 576 -1176 577 -1175 175 -1044.5 177.5 </Link> <Link from="node_NOP_1" output="OUTPUT" to="node_Feedback_2" input="INPUT"/> - <Link from="node_SKIP_N_1" output="OUTPUT" to="node_NOP_1" input="INPUT"/> <Link from="node_NOP_2" output="OUTPUT" to="node_Feedback_1" input="INPUT"/> <Link from="node_SKIP_N_2" output="OUTPUT" to="node_NOP_2" input="INPUT"/> --- 122,125 ---- *************** *** 138,141 **** --- 137,141 ---- <Link from="node_ComponentsViewer_1" output="IMAGE" to="node_ImageProbe_1" input="INPUT"/> <Link from="node_NilObject_3" output="VALUE" to="node_ImageProbe_1" input="SAVE_FILENAME"/> + <Link from="node_SKIP_N_1" output="OUTPUT" to="node_NOP_1" input="INPUT"/> <NetCondition name="CONDITION" node="node_Constant_1" terminal="VALUE"/> <NetInput name="BLACK_WHITE_LOOKUP" node="node_READ_1" terminal="BLACK_WHITE_LOOKUP" object_type="any" description="No description available"/> |