From 75bb5f8f835460f215dfd8ddc46b59476077dc17 Mon Sep 17 00:00:00 2001 From: klugier Date: Sat, 27 Aug 2016 13:26:04 +0000 Subject: [PATCH] .uppweb Hunt for several dead links git-svn-id: svn://ultimatepp.org/upp/trunk@10196 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppbox/uppweb/www.tpp/all.i | 8 +++++ uppbox/uppweb/www.tpp/comparison$en-us.tpp | 33 +++++++++---------- uppbox/uppweb/www.tpp/comparison$en-us.tppi | 12 +++---- uppbox/uppweb/www.tpp/tutoring$en-us.tpp | 6 ++-- uppbox/uppweb/www.tpp/vsd$en-us.tpp | 35 +++++++++------------ 5 files changed, 46 insertions(+), 48 deletions(-) diff --git a/uppbox/uppweb/www.tpp/all.i b/uppbox/uppweb/www.tpp/all.i index 387d65b4b..fc18c1bdc 100644 --- a/uppbox/uppweb/www.tpp/all.i +++ b/uppbox/uppweb/www.tpp/all.i @@ -258,6 +258,10 @@ TOPIC("svnInstall$en-us") #include "svnInstall$en-us.tppi" END_TOPIC +TOPIC("tutoring$en-us") +#include "tutoring$en-us.tppi" +END_TOPIC + TOPIC("ubuntuinstall$en-us") #include "ubuntuinstall$en-us.tppi" END_TOPIC @@ -266,3 +270,7 @@ TOPIC("uppx11$en-us") #include "uppx11$en-us.tppi" END_TOPIC +TOPIC("vsd$en-us") +#include "vsd$en-us.tppi" +END_TOPIC + diff --git a/uppbox/uppweb/www.tpp/comparison$en-us.tpp b/uppbox/uppweb/www.tpp/comparison$en-us.tpp index d2cd5ba4a..253f62d0b 100644 --- a/uppbox/uppweb/www.tpp/comparison$en-us.tpp +++ b/uppbox/uppweb/www.tpp/comparison$en-us.tpp @@ -4,7 +4,7 @@ topic "Comparison"; [a83;*R6 $$2,5#31310162474203024125188417583966:caption] [b83;*4 $$3,5#07864147445237544204411237157677:title] [i288;O9;C2 $$4,6#40027414424643823182269349404212:item] -[b42;a42;2 $$5,5#45413000475342174754091244180557:text] +[b42;a42;ph2 $$5,5#45413000475342174754091244180557:text] [l288;b17;a17;2 $$6,6#27521748481378242620020725143825:desc] [l321;t246;C@5;1 $$7,7#20902679421464641399138805415013:code] [b2503;2 $$8,0#65142375456100023862071332075487:separator] @@ -24,27 +24,24 @@ topic "Comparison"; [{_}%EN-US [s2;a0; Comparisons&] [s5;>b0;a83;*R^topic`:`/`/uppweb`/www`/comparison`$ru`-ru^1 &] -[s0; In order to demonstrate advantages of Ultimate`+`+, we have +[s5; In order to demonstrate advantages of Ultimate`+`+, we have reimplemented some examples of other libraries.&] -[s0; &] -[s0; [^topic`:`/`/uppweb`/www`/vsqt`$en`-us^ Comparison vs Qt]&] -[s0; [^topic`:`/`/uppweb`/www`/vsswing`$en`-us^ Comparison vs Java/Swing]&] -[s0; [^topic`:`/`/uppweb`/www`/vswx`$en`-us^ Comparison vs wxWidget][^topic`:`/`/uppweb2`/www`/vsstd`$en`-us^ s -]&] -[s0; &] -[s0; To demonstrate how not using standard C`+`+ library affects +[s5;l160;i150;O0; [^topic`:`/`/uppweb`/www`/vsqt`$en`-us^ Comparison +vs Qt]&] +[s5;l160;i150;O0; [^topic`:`/`/uppweb`/www`/vsswing`$en`-us^ Comparison +vs Java/Swing]&] +[s5;l160;i150;O0; [^topic`:`/`/uppweb`/www`/vswx`$en`-us^ Comparison +vs wxWidget][^topic`:`/`/uppweb2`/www`/vsstd`$en`-us^ s]&] +[s5; To demonstrate how not using standard C`+`+ library affects application performance, we have provided following comparison:&] -[s0; &] -[s0; [^topic`:`/`/uppweb`/www`/vsstd`$en`-us^ U`+`+ Core vs C`+`+ standard -library benchmarks]&] -[s0; [^topic`:`/`/uppweb`/www`/vsd`$en`-us^ U`+`+ Core vs D programming -language]&] -[s0;3 &] -[s0; Before following those links, please keep in mind that similar +[s5;l160;i150;O0; [^topic`:`/`/uppweb`/www`/vsstd`$en`-us^ U`+`+ Core +vs C`+`+ standard library benchmarks]&] +[s5;l160;i150;O0; [^topic`:`/`/uppweb`/www`/vsd`$en`-us^ U`+`+ Core +vs D programming language]&] +[s5; Before following those links, please keep in mind that similar comparisons are always a little bit tricky. While we have tried to be as fair as possible, we were reimplementing tutorial examples which are quite specific stuff. Anyway, if you feel like we have harmed you favorite platform, nothing prevents you to implement those applications in more optimal way or suggest improvements -`- we will be glad to use your version here.&] -[s0; ]] \ No newline at end of file +`- we will be glad to use your version here.]] \ No newline at end of file diff --git a/uppbox/uppweb/www.tpp/comparison$en-us.tppi b/uppbox/uppweb/www.tpp/comparison$en-us.tppi index 2cca1f087..f15dd9839 100644 --- a/uppbox/uppweb/www.tpp/comparison$en-us.tppi +++ b/uppbox/uppweb/www.tpp/comparison$en-us.tppi @@ -1,9 +1,9 @@ TITLE("Comparison") COMPRESSED -120,156,141,85,239,111,219,54,16,253,87,8,56,27,182,84,73,120,252,33,82,50,48,116,75,247,97,251,208,109,237,138,126,48,220,153,182,233,152,136,44,169,162,108,39,24,214,191,125,143,178,19,55,24,130,37,134,237,128,230,187,123,247,238,221,105,34,216,217,25,207,248,136,255,207,95,249,198,175,220,182,234,167,147,74,88,59,14,68,130,143,29,153,241,111,197,248,203,151,47,151,164,184,29,167,96,132,96,196,149,36,65,56,227,74,24,210,5,47,180,37,203,165,81,66,27,174,203,214,117,110,51,157,56,43,199,231,239,114,160,68,166,71,146,36,113,202,133,194,45,46,185,80,36,52,89,171,200,104,43,139,60,47,23,174,237,67,83,79,39,243,132,83,128,73,192,184,177,185,34,128,148,22,210,104,5,176,82,160,39,145,216,228,198,148,125,232,43,63,157,132,196,27,108,175,19,75,149,229,35,176,19,6,72,37,84,174,164,21,146,172,16,121,33,85,161,64,155,68,25,122,15,146,115,37,198,14,239,4,211,200,167,180,34,9,69,148,209,18,215,12,190,21,47,72,32, -169,229,90,35,159,191,123,144,105,14,129,146,72,9,155,35,165,48,58,33,172,178,36,141,21,74,228,2,36,184,65,161,137,129,46,151,62,46,128,149,130,198,61,104,141,175,95,235,49,1,108,50,51,18,188,224,34,55,5,146,130,48,106,150,69,65,210,34,169,34,205,73,150,139,102,137,58,231,66,115,57,100,180,104,69,142,200,131,44,58,39,144,22,210,34,165,33,41,241,169,149,53,101,244,169,25,125,211,77,39,231,175,191,227,151,252,82,104,253,125,130,23,128,91,169,164,84,121,161,136,75,164,65,12,149,52,203,57,218,73,90,216,114,238,34,114,246,56,50,7,101,41,185,9,218,75,171,37,82,231,248,64,95,81,160,132,62,162,80,86,74,203,203,69,229,98,60,138,148,4,58,79,69,18,101,68,35,147,180,213,82,168,34,137,35,5,68,22,185,46,8,42,235,92,113,81,118,254,243,54,116,126,227,107,200,28,96,143,241,67,139,142,94,4,153,131,21,69,70,2,102,212,121,206,147,94,26,134,16,82,67,112,78,86,129,17,94,104,115,127,116,227,252,84,131,204, -72,142,10,161,36,152,20,74,65,1,4,160,130,136,184,197,11,149,65,151,193,31,116,52,214,49,253,1,174,50,82,35,3,27,163,83,133,74,233,11,153,244,19,144,95,228,92,163,15,226,0,23,73,117,113,6,221,73,216,244,30,148,39,157,17,230,1,20,73,107,212,45,33,181,176,168,93,67,123,57,88,156,140,45,223,250,125,124,227,122,127,52,204,249,245,217,193,105,148,103,148,143,120,194,107,91,160,129,164,146,126,82,169,66,20,82,106,81,104,153,115,232,24,15,3,157,192,105,164,134,113,124,12,98,50,50,24,46,212,170,53,170,31,96,168,220,80,162,34,108,145,39,21,142,65,102,23,85,168,19,15,56,99,124,48,195,249,245,43,34,147,2,89,12,141,181,57,151,5,196,128,6,92,195,233,88,8,22,141,70,159,5,198,32,109,132,197,173,187,241,179,139,227,180,14,20,146,3,181,212,54,249,22,72,80,7,9,196,41,56,207,113,98,45,166,169,188,113,237,19,3,10,158,9,14,23,97,255,104,12,37,114,193,126,188,72,187,4,155,1,29,192,42,42,244,193, -129,179,139,218,199,222,47,209,124,205,135,178,5,101,130,160,29,252,167,181,85,42,7,95,228,54,105,53,165,22,98,128,181,145,229,239,14,243,242,247,95,255,124,243,243,219,139,15,239,217,36,194,128,124,204,174,155,13,204,20,98,83,199,111,167,147,168,199,63,204,249,65,214,119,159,250,166,13,139,89,57,187,154,93,109,219,118,239,231,179,171,253,126,63,187,90,60,98,102,103,221,118,118,209,109,63,17,75,104,196,251,165,102,77,183,244,29,235,27,182,244,27,132,237,49,171,158,185,229,206,213,61,244,138,172,89,177,15,85,31,54,56,158,189,154,189,202,216,222,179,181,219,121,214,249,176,105,171,97,76,252,146,197,102,227,153,191,115,233,104,0,53,253,26,113,171,48,239,144,220,199,203,99,198,227,215,228,89,186,187,248,185,159,157,249,122,118,177,141,159,190,42,152,237,34,251,163,159,190,0,31,247,161,190,121,46,196,175,110,231,174,222,167,27,47,9,181,191,123,46,206,254,238,99,88,222,120,216,251,191,112,113,162,210,47,79,1,226,244,169,6,127,62,213,124,221, -236,89,221,244,108,27,65,142,197,222,213,75,215,45,217,117,82,253,168,227,61,115,171,149,95,244,145,185,182,173,194,194,165,199,21,107,125,183,106,186,141,171,23,254,212,157,182,107,118,97,137,198,172,154,170,106,82,189,236,100,132,242,229,205,120,82,193,135,129,203,117,211,249,36,193,129,217,35,209,7,138,115,95,47,214,27,215,221,198,151,40,252,108,244,55,169,132,27,44,206,77,226,94,185,250,102,11,63,30,67,202,7,234,63,249,85,186,127,42,178,95,55,209,131,75,125,27,51,6,47,226,241,193,110,189,111,89,168,25,34,45,113,193,245,44,134,77,168,92,247,149,36,144,20,113,92,181,119,247,248,23,1,122,172,9,54,15,61,235,187,176,184,189,191,100,31,215,1,39,15,250,226,20,226,98,108,230,64,69,182,114,161,75,223,109,19,99,152,87,135,70,236,125,247,100,76,6,126,91,60,10,131,171,78,179,178,95,135,197,122,200,142,199,14,124,16,91,191,8,171,176,128,178,219,213,234,146,253,88,223,131,84,198,194,138,221,55,91,182,242,190,2,189,219,19,149, -181,235,54,224,50,252,232,118,136,142,32,109,229,250,100,138,44,89,106,157,18,183,157,223,129,67,28,238,129,247,35,171,163,100,95,57,42,14,98,37,93,155,54,77,126,197,64,0,139,130,197,237,13,86,66,159,176,176,215,128,142,108,118,49,212,26,170,42,105,113,83,185,65,150,45,66,34,83,199,118,190,139,201,165,216,6,254,97,9,76,167,255,2,129,77,244,62, +120,156,149,85,239,111,219,54,16,253,87,8,56,27,182,84,73,120,252,33,82,50,48,108,75,247,97,251,208,110,237,138,126,48,220,153,182,233,152,136,44,169,162,108,39,24,214,191,125,143,178,19,167,24,130,33,49,108,7,52,223,221,187,119,239,78,19,193,206,206,120,198,71,252,127,254,202,215,126,229,182,85,63,157,84,194,218,113,32,18,124,236,200,140,223,22,227,47,95,190,92,146,226,118,156,130,17,130,17,87,146,4,225,140,43,97,72,23,188,208,150,44,151,70,9,109,184,46,91,215,185,205,116,226,172,28,159,191,203,129,18,153,30,73,146,196,41,23,10,183,184,228,66,145,208,100,173,34,163,173,44,242,188,92,184,182,15,77,61,157,204,19,78,1,38,1,227,198,230,138,0,82,90,72,163,21,192,74,129,158,68,98,147,27,83,246,161,175,252,116,18,18,111,176,189,78,44,85,150,143,192,78,24,32,149,80,185,146,86,72,178,66,228,133,84,133,2,109,18,101,232,61,72,206,149,24,59,188,219,117,2,106,100,84,90,145,132,38,202,104,137,139,6,223,138,23, +36,144,214,114,173,145,209,223,61,8,53,135,68,73,166,132,205,145,84,24,157,16,86,89,146,198,10,37,114,1,26,220,160,212,196,65,151,75,31,23,192,74,65,227,30,196,198,215,63,234,49,1,108,50,51,18,188,224,34,55,5,146,130,50,170,150,69,65,210,34,169,34,205,73,150,139,102,137,74,231,66,115,57,100,180,104,70,142,200,131,48,58,39,144,22,210,34,165,33,41,241,169,149,53,101,244,169,29,125,211,77,39,231,63,126,199,47,249,165,208,250,251,4,47,0,183,82,73,169,242,66,17,151,72,131,24,42,169,150,115,52,148,180,176,229,220,69,228,236,113,100,14,218,82,242,19,212,151,86,75,164,206,241,129,206,162,64,9,125,68,161,172,148,150,151,139,202,197,120,20,41,9,116,158,138,36,202,136,70,38,105,171,165,80,69,18,71,10,136,44,114,93,16,84,214,185,226,162,236,252,231,109,232,252,198,215,144,57,192,32,227,135,38,29,221,8,50,7,51,138,140,4,236,168,243,156,39,189,52,44,33,164,134,224,156,172,2,35,188,208,232,254,232,199,249,169, +6,153,145,28,21,66,73,48,41,148,130,2,8,64,5,17,113,139,23,42,131,46,131,67,232,104,173,99,250,3,92,101,164,70,6,70,70,167,10,149,210,23,50,233,39,32,191,200,185,70,31,196,1,46,146,234,226,12,186,147,176,233,61,40,79,58,35,76,4,40,146,214,168,91,66,106,97,81,187,134,246,114,48,57,25,91,190,241,251,248,218,245,254,104,152,243,235,179,131,211,40,207,40,31,241,132,215,182,64,3,73,37,253,164,82,133,40,164,212,162,208,50,231,208,49,30,70,58,129,211,80,13,3,249,24,196,100,100,48,94,168,85,107,84,63,192,80,185,161,68,69,216,34,79,42,28,131,204,46,170,80,39,30,112,198,248,96,134,243,235,87,68,38,5,178,24,26,107,115,46,11,136,1,13,184,134,211,177,18,44,26,141,62,11,140,65,218,9,139,91,119,227,103,23,199,121,29,40,36,7,106,169,109,242,45,144,160,14,18,136,83,112,158,227,196,90,76,83,121,227,218,175,12,40,120,38,56,92,132,13,164,49,148,200,5,251,241,34,109,19,236,6,116,0,203,168, +208,7,7,206,46,106,31,123,191,68,243,53,31,202,22,148,9,130,118,240,159,214,86,169,28,124,145,219,164,229,148,90,136,1,214,70,150,191,59,204,203,223,127,253,243,205,47,111,46,62,188,103,147,8,3,242,49,187,110,54,48,83,136,77,29,191,157,78,162,30,255,48,231,7,89,223,125,234,155,54,44,102,229,236,106,118,181,109,219,189,159,207,174,246,251,253,236,106,241,136,153,157,117,219,217,69,183,253,68,236,128,102,191,214,172,233,150,190,99,125,195,150,126,131,176,61,102,213,51,183,220,185,186,135,94,145,53,43,246,161,234,195,6,199,179,87,179,87,25,219,123,182,118,59,207,58,31,54,109,53,140,137,95,178,216,108,60,243,119,46,29,13,160,166,95,35,110,21,230,29,146,251,120,121,200,56,52,48,96,157,140,223,162,156,201,179,164,119,241,115,63,59,243,245,236,98,27,63,61,41,155,237,34,251,163,159,190,52,88,220,135,250,230,185,120,191,185,157,187,122,159,110,188,56,238,254,238,185,160,251,187,143,97,121,227,97,255,255,194,197,137,87,191,60,5,136, +199,244,236,207,175,155,177,110,246,172,110,122,182,141,160,200,98,239,234,165,235,150,236,58,181,227,40,240,61,115,171,149,95,244,145,185,182,173,194,194,165,39,25,107,125,183,106,186,141,171,23,254,212,182,182,107,118,97,137,142,173,154,170,106,82,213,236,228,144,242,197,194,62,45,224,195,192,232,186,233,124,82,224,192,239,145,238,3,209,185,175,23,235,141,235,110,227,139,213,126,54,213,235,84,213,13,150,236,38,149,83,185,250,102,11,239,62,200,249,179,95,165,123,167,122,251,117,19,61,8,213,183,49,99,240,43,30,49,236,214,251,150,133,154,33,194,18,23,92,207,98,216,132,202,117,79,212,129,186,136,227,170,189,187,199,191,8,208,99,149,176,121,232,89,223,133,197,237,253,37,251,184,14,56,121,144,26,167,208,25,163,53,7,42,178,149,11,93,250,110,155,24,195,188,58,244,100,239,187,175,70,105,224,183,197,227,50,184,234,52,79,251,117,88,172,135,236,120,52,193,18,177,245,139,176,10,11,200,187,93,173,46,217,79,245,61,72,101,44,172,216,125,179,101,43,239, +43,208,187,61,81,89,187,110,3,46,195,143,110,135,232,8,210,86,174,79,254,200,146,187,214,41,113,219,249,29,56,196,225,30,120,63,178,58,74,246,196,92,113,16,43,233,218,180,105,59,84,12,4,176,76,88,220,222,96,109,244,9,11,167,13,232,200,102,23,67,173,161,170,146,22,55,149,27,100,217,34,36,50,117,108,231,187,152,12,139,141,225,47,167,211,127,1,127,115,251,185, diff --git a/uppbox/uppweb/www.tpp/tutoring$en-us.tpp b/uppbox/uppweb/www.tpp/tutoring$en-us.tpp index ecac6b8fd..578a5de67 100644 --- a/uppbox/uppweb/www.tpp/tutoring$en-us.tpp +++ b/uppbox/uppweb/www.tpp/tutoring$en-us.tpp @@ -6,8 +6,8 @@ topic "Tutoring Plan"; [s0; &] [s0;# [2 If you find that U`+`+ is a nice C`+`+ library and development environment but you have problems beginning to use it and you -do not feel comfortable with ][^http`:`/`/www`.ultimatepp`.org`/forum`/^2 Forum][2 , -][/2 Tutoring Plan is for you][2 .]&] +do not feel comfortable with ][^http`:`/`/www`.ultimatepp`.org`/forums`/^2 Forum][2 , + ][/2 Tutoring Plan is for you][2 .]&] [s0;2%- &] [s0;2%- &] [ {{10000f0;g0;^t/25b4/25 [s0;# [*+117 Proposal]]}}&] @@ -61,4 +61,4 @@ mentoring.]&] :: [s0; [2 Begin date will be 2010/07/12.]] :: [s0;# [2 2010/06/26]] :: [s0; [2 Infrastructure is prepared and we are ready to begin.]]}}&] -[s0; ] \ No newline at end of file +[s0; ]] \ No newline at end of file diff --git a/uppbox/uppweb/www.tpp/vsd$en-us.tpp b/uppbox/uppweb/www.tpp/vsd$en-us.tpp index b5e42269c..7458ae64d 100644 --- a/uppbox/uppweb/www.tpp/vsd$en-us.tpp +++ b/uppbox/uppweb/www.tpp/vsd$en-us.tpp @@ -7,41 +7,34 @@ topic "Ultimate++ vs D programming language"; [i448;a25;kKO9;*@(64)2 $$5,0#37138531426314131252341829483370:item] [*+117 $$6,6#14700283458701402223321329925657:header] [l288;a17;*1 $$7,7#70004532496200323422659154056402:requirement] -[b42;a42;2 $$8,8#45413000475342174754091244180557:text] +[b42;a42;ph2 $$8,8#45413000475342174754091244180557:text] [{_}%EN-US [s0; [*R6 U`+`+ Core vs D programming language]&] -[s0;>*^topic`:`/`/uppweb`/www`/vsd`$ru`-ru^1 &] -[s0;^topic`:`/`/uppweb`/www`/comparison`$ru`-ru^ &] -[s0; D programming language authors give a nice example of D language +[s8; D programming language authors give a nice example of D language string and map here:&] -[s0; &] -[s0; [^http`:`/`/www`.digitalmars`.com`/d`/2`.0`/cppstrings`.html^ http://www.digitalmar -s.com/d/2.0/cppstrings.html]&] -[s0; &] -[s0; We have taken the chance to reimplement this in U`+`+ and tested +[s8; http://www.digitalmars.com/d/2.0/cppstrings.html [/ (Currently +unavailable `- 2016.08.27)]&] +[s8; We have taken the chance to re implement this in U`+`+ and tested with Ubuntu 64 platform. `"gdc`" compiler was used with flags suggested in the article.&] -[s0; &] -[s0; We had to test with larger file than `"Alice30.txt`", because +[s8; We had to test with larger file than `"Alice30.txt`", because host platform was too fast for such small file, therefore we -combined a couple of text files from the [^http`:`/`/www`.gutenberg`.org`/ebooks`/11^ s +combined a couple of text files from the [^http`:`/`/www`.umich`.edu`/`~umfandsf`/other`/ebooks`/alice30`.txt^ s ame source] to form a single 2MB file.&] -[s0; &] -[s0; We have also removed the code to produce the output to make +[s8; We have also removed the code to produce the output to make results more relevant.&] -[s0; &] -[s0; Results:&] -[s0; &] +[s8; Results:&] +[s8; &] [ {{3333:3333:3334<768;>800;h1;@7 [s0; [* D language]] :: [s0; [* U`+`+]] :: [s0; [* U`+`+ / D language]] ::@2 [s0; 0.072s] :: [s0; 0.043s] :: [s0; 1.7]}}&] -[s0; &] -[s0; Means C`+`+ is still well ahead of D (by 70%) if not being hold +[s8; &] +[s8; Means C`+`+ is still well ahead of D (by 70%) if not being hold back by standard library design and average implementation...&] -[s0; &] +[s8; &] [ {{10000@(254.254.208) [s0; [*C@5 #include ]&] [s0;*C@5 &] [s0; [*C@5 using namespace Upp;]&] @@ -95,4 +88,4 @@ total`_bytes);]&] [s0; [*C@5 -|return 0;]&] [s0; [*C@5 `}]&] [s0;*C@5 ]}}&] -[s0; ] \ No newline at end of file +[s8; ]] \ No newline at end of file