Merge pull request #24 from zguolee/LiZhiguo

更新第5章

Author: ZhiGuoLi

第5章数据结构一/5.1向量/5-1完数与盈数.cpp

@@ -1,8 +1,6 @@
 #include<iostream>
 #include<vector>
-
 using namespace std;
-
 int getSum(int x) {
     int sum=0;
     for(int i=1; i<x; i++) {
@@ -17,18 +15,18 @@ int main() {
     vector<int> num_E;
     vector<int> num_G;
     for(int i=2; i<=60; i++) {
-        if(getSum(i)==i) {
+        if(i==getSum(i)) {
             num_E.push_back(i);
-        } else if(getSum(i)>i) {
+        } else if(i<getSum(i)) {
             num_G.push_back(i);
         }
     }
     printf("E:");
-    for(int i=0;i<num_E.size();i++){
+    for(int i=0; i<num_E.size(); i++) {
         printf(" %d",num_E[i]);
     }
     printf("\nG:");
-    for(int i=0;i<num_G.size();i++){
+    for(int i=0; i<num_G.size(); i++) {
         printf(" %d",num_G[i]);
     }
     return 0;

第5章数据结构一/5.2队列/5-2约瑟夫问题.cpp

@@ -1,37 +1,35 @@
 #include<iostream>
 #include<queue>
-
 using namespace std;
 
 int main() {
-    //n，n个小孩；p开始报数；m间隔
     int n,p,m;
-    while(scanf("%d%d%d",&n,&p,&m)!=EOF) {
+    while(scanf("%d%d%d",&n,&p,&m)) {
         if(n==0&&p==0&&m==0) {
             break;
         }
-        queue<int> children;
-        //初始化队列
+        queue<int> myQueue;
         for(int i=0; i<n; i++) {
-            children.push(i+1);
+            myQueue.push(i+1);
         }
-        //使序号为p的小孩到队首
         for(int i=1; i<p; i++) {
-            children.push(children.front());
-            children.pop();
+            myQueue.push(myQueue.front());
+            myQueue.pop();
         }
-        while(!children.empty()) {
+        while(!myQueue.empty()) {
             for(int i=1; i<m; i++) {
-                children.push(children.front());
-                children.pop();
+                myQueue.push(myQueue.front());
+                myQueue.pop();
             }
-            if(children.size()==1) {
-                printf("%d\n",children.front());
+            if(myQueue.size()==1) {
+                printf("%d",myQueue.front());
+                myQueue.pop();
             } else {
-                printf("%d,",children.front());
+                printf("%d,",myQueue.front());
+                myQueue.pop();
             }
-            children.pop();
         }
+        printf("\n");
     }
     return 0;
 }

第5章数据结构一/5.2队列/5-3猫狗收容所.cpp

@@ -1,65 +1,58 @@
 #include<iostream>
 #include<queue>
-
-/*
-6
-1 1
-1 -1
-2 0
-1 2
-2 -1
-2 1
-*/
-
 using namespace std;
-
 struct Animal {
-    int index;
-    int id;
-    Animal(int a,int b):index(a),id(b) {}
+    int order,id;
+    Animal(int o,int i):order(o),id(i) {}
 };
 int main() {
-    int n,m,t,order=0;//order表示索引
-    scanf("%d",&n);
-    queue<Animal> dog;
-    queue<Animal> cat;
-    for(int i=0; i<n; i++) {
-        scanf("%d%d",&m,&t);
-        if(m==1) {
-            if(t>0) {
-                dog.push(Animal(order++,t));
-            } else if(t<0) {
-                cat.push(Animal(order++,t));
-            }
-        } else {
-            if(t==0&&!dog.empty()&&!cat.empty()) {
-                    //收养最早的动物
-                if(dog.front().index<cat.front().index) {
-                    //如果狗的索引更小
+    int n;
+    while(scanf("%d",&n)!=EOF) {
+        queue<Animal> dog,cat;
+        int order=0,m,t;
+        for(int i=0; i<n; i++) {
+            scanf("%d%d",&m,&t);
+            if(m==1) {
+                if(t>0) {//狗进入收容所
+                    dog.push(Animal(order++,t));
+                } else {
+                    cat.push(Animal(order++,t));
+                }
+            } else {
+                bool isDog=true;
+                if(t==0) { //收养动物中最早进入
+                    if(dog.empty()&&cat.empty()) {
+                        continue;
+                    } else if(cat.empty()) {
+                        //狗中找
+                        isDog=true;
+                    } else if(dog.empty()) {
+                        //猫中找
+                        isDog=false;
+                    } else {
+                        if(dog.front().order>cat.front().order) {
+                            //收养猫
+                            isDog=false;
+                        }
+                    }
+                } else if(t>0) { //收养狗
+                    if(dog.empty()) {
+                        continue;
+                    }
+                } else {
+                    if(cat.empty()) {
+                        continue;
+                    }
+                    isDog=false;
+                }
+                if(isDog) {
                     printf("%d ",dog.front().id);
                     dog.pop();
                 } else {
                     printf("%d ",cat.front().id);
                     cat.pop();
                 }
-            } else if(t==0&&dog.empty()&&!cat.empty()) {
-                //收养最早的动物，狗为空
-                printf("%d ",cat.front().id);
-                cat.pop();
-            } else if(t==0&&!dog.empty()&&cat.empty()) {
-                //收养最早的动物，猫为空
-                printf("%d ",dog.front().id);
-                dog.pop();
-            } else if(t==1&&!dog.empty()) {
-                //收养狗
-                printf("%d ",dog.front().id);
-                dog.pop();
-            } else if(t==-1&&!cat.empty()) {
-                //收养猫
-                printf("%d ",cat.front().id);
-                cat.pop();
             }
-            printf("\n");
         }
     }
     return 0;

第5章数据结构一/5.3栈/5-4Zero-complexity Transposition.cpp

@@ -3,19 +3,19 @@
 
 using namespace std;
 
-int main(){
-	int n;
-	stack<long long> num;
-	long long temp;
-	while(scanf("%d",&n)!=EOF){
-		for(int i=0;i<n;i++){
-			cin>>temp;
-			num.push(temp);
-		}
-		for(int i=0;i<n;i++){
-			cout<<num.top()<<" ";
-			num.pop();
-		}
-	}
-	return 0;
+int main() {
+    int n;
+    stack<long long> num;
+    long long temp;
+    while(scanf("%d",&n)!=EOF) {
+        for(int i=0; i<n; i++) {
+            cin>>temp;
+            num.push(temp);
+        }
+        for(int i=0; i<n; i++) {
+            cout<<num.top()<<" ";
+            num.pop();
+        }
+    }
+    return 0;
 }

第5章数据结构一/5.3栈/5-5括号匹配问题.cpp

@@ -19,9 +19,11 @@ int main() {
                 }
             } else if(str[i]=='(') {
                 brackets.push(i);
+            } else {
+                continue;
             }
         }
-        while(!brackets.empty()){
+        while(!brackets.empty()) {
             answer[brackets.top()]='$';
             brackets.pop();
         }