modified: ../c/resistor/src/main.c

	renamed:    ../c/r/CMakeLists.txt -> ../cmake/r/CMakeLists.txt
	renamed:    ../c/r/main.c -> ../cmake/r/main.c
	renamed:    ../c/r/resistor/CMakeLists.txt -> ../cmake/r/resistor/CMakeLists.txt
	renamed:    ../c/r/resistor/build.sh -> ../cmake/r/resistor/build.sh
	renamed:    ../c/r/resistor/resistorcal.c -> ../cmake/r/resistor/resistorcal.c
	renamed:    ../c/r/resistor/resistorcal.h -> ../cmake/r/resistor/resistorcal.h
	new file:   ../cmake/r1/CMakeLists.txt
	new file:   ../cmake/r1/main.c
	new file:   ../cmake/r1/resistor/CMakeLists.txt
	new file:   ../cmake/r1/resistor/build.sh
	new file:   ../cmake/r1/resistor/resistorcal.c
	new file:   ../cmake/r1/resistor/resistorcal.h

Author: DataEraserC

c/resistor/src/main.c

@@ -22,4 +22,5 @@ int main(){
         case '1' : printf("R=%lf\n",resistorcal(r1,r2,choice));break;
         case '2' : printf("R2=%lf\n",resistorcal(r1,r2,choice));break;
     }
+    return 0;
 }

c/r/CMakeLists.txt cmake/r/CMakeLists.txtc/r/CMakeLists.txt renamed to cmake/r/CMakeLists.txt

@@ -22,4 +22,5 @@ int main(){
         case '1' : printf("R=%lf\n",resistorcal(r1,r2,choice));break;
         case '2' : printf("R2=%lf\n",resistorcal(r1,r2,choice));break;
     }
+    return 0;
 }

c/r/main.c cmake/r/main.cc/r/main.c renamed to cmake/r/main.c

@@ -0,0 +1,6 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.9)
+PROJECT(RESISTOR)
+ADD_SUBDIRECTORY(resistor)
+AUX_SOURCE_DIRECTORY(. DIR_SRC)
+ADD_EXECUTABLE(bin ${DIR_SRC})
+TARGET_LINK_LIBRARIES(bin RESISTOR)

c/r/resistor/CMakeLists.txt cmake/r/resistor/CMakeLists.txtc/r/resistor/CMakeLists.txt renamed to cmake/r/resistor/CMakeLists.txt

@@ -0,0 +1,26 @@
+#include <stdio.h>
+#include "resistor/resistorcal.h"
+int main(){
+    printf("Welcome to Mayuri's Resistor Calculator(Only for separate routes and 2 resistor in it)\n");
+    printf("Make your choice\n> 1.Your have the two resistors of separate routes\n> 2. Your have one of the resistors in the separate routes and the total resistor\nAny other choice is to exit\n");
+    char choice;
+    scanf("%c",&choice);
+    switch (choice){
+        case '1' : printf("Please input your args as [R1 R2]:\n");break;
+        case '2' : printf("Please input your args as [R1 R]:\n");break;
+        default : printf("exiting\n");return 0;break;
+    }
+    double r1 = -1 ,r2 = -1;
+    scanf("%lf %lf",&r1,&r2);
+    while ((r1<0)||(r2<0)) {
+        printf("args don't meet the requirement(R>0)\n");
+        printf("please input them again:\n");
+        scanf("%lf %lf",&r1,&r2);
+
+    }
+    switch (choice){
+        case '1' : printf("R=%lf\n",resistorcal(r1,r2,choice));break;
+        case '2' : printf("R2=%lf\n",resistorcal(r1,r2,choice));break;
+    }
+    return 0;
+}

c/r/resistor/build.sh cmake/r/resistor/build.shc/r/resistor/build.sh renamed to cmake/r/resistor/build.sh

@@ -0,0 +1,2 @@
+AUX_SOURCE_DIRECTORY(. DIR_LIB_SRCS)
+ADD_LIBRARY(RESISTOR ${DIR_LIB_SRCS})